Color

Share Ext/ShareViewController.m

@@ -167,7 +167,7 @@
     tintColor = self.navigationController.navigationBar.tintColor;
     
     if (barTintColor == nil) barTintColor = COLOR_NAVIGATIONBAR;
-    if (tintColor == nil) tintColor  = COLOR_GRAY;
+    if (tintColor == nil) tintColor  = COLOR_NAVIGATIONBAR_TEXT;
     
     // Toolbar Color & navigationBar Color
     self.toolBar.barTintColor = barTintColor;
@@ -180,7 +180,7 @@
     if (self.localCryptated && _isCryptoCloudMode) {
         
         rightButtonUpload = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"_save_encrypted_", nil) style:UIBarButtonItemStylePlain target:self action:@selector(selectPost)];
-        [rightButtonUpload setTintColor:COLOR_ENCRYPTED];
+        [rightButtonUpload setTintColor:COLOR_CRYPTOCLOUD];
         
     } else {
         
@@ -191,7 +191,7 @@
     if (_isCryptoCloudMode) {
         UIImage *icon = [[UIImage imageNamed:image_shareExtEncrypt] imageWithRenderingMode:UIImageRenderingModeAutomatic];
         rightButtonEncrypt = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(changeEncrypt)];
-        if (self.localCryptated) [rightButtonEncrypt setTintColor:COLOR_ENCRYPTED];
+        if (self.localCryptated) [rightButtonEncrypt setTintColor:COLOR_CRYPTOCLOUD];
     }
     
     // Cancel
@@ -378,7 +378,7 @@
     viewController.touchIDManager = touchIDManager;
     viewController.title = @"Nextcloud";
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
     [self presentViewController:navController animated:YES completion:nil];

iOSClient/AppDelegate.m

@@ -167,8 +167,8 @@
     // Page Control
     UIPageControl *pageControl = [UIPageControl appearance];
     pageControl.pageIndicatorTintColor = [UIColor whiteColor];
-    pageControl.currentPageIndicatorTintColor = COLOR_NEXTCLOUD;
-    pageControl.backgroundColor = COLOR_NAVIGATIONBAR;
+    pageControl.currentPageIndicatorTintColor = COLOR_PAGECONTROL_INDICATOR;
+    pageControl.backgroundColor = COLOR_BACKGROUND_PAGECONTROL;
     
     // remove tmp & cache
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -219,7 +219,7 @@
     // it is a device Jailbroken
     self.isDeviceJailbroken = isDeviceJailbroken();
 
-    [self.window setTintColor:COLOR_BRAND];
+    [self.window setTintColor:COLOR_NAVIGATIONBAR_TEXT];
     
     UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController;
     //UITabBarController *tabBarController = [splitViewController.viewControllers firstObject];
@@ -657,7 +657,7 @@
             backgroundColor = [UIColor colorWithRed:0.588 green:0.797 blue:0.000 alpha:0.90];
             break;
         case TWMessageBarMessageTypeInfo:
-            backgroundColor = COLOR_BRAND_MESSAGE;
+            backgroundColor = COLOR_BRAND;
             break;
         default:
             break;

iOSClient/CCGlobal.h

@@ -264,30 +264,37 @@ extern NSString *const BKPasscodeKeychainServiceName;
 // NEXTCLOUD COLOR [DEFAULT]
 #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]
+#define COLOR_BRAND                     [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]                   // NC : #0082c9
 
-#define COLOR_BRAND_NAVIGATIONBAR [UIColor greenColor]; //[UIColor colorWithRed:(0.0/255.0) green:(130.0/255.0) blue:(201/255.0) alpha:1.0]
-#define COLOR_BRAND_NAVIGATIONBAR_TEXT [UIColor whiteColor]
+#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]
+
+#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 COLOR_NAVIGATIONBAR             [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+#define COLOR_NAVIGATIONBAR_TEXT        [UIColor whiteColor]
+#define COLOR_NAVIGATIONBAR_PROGRESS    [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]
+
+#define COLOR_TABBAR                    [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1]
+#define COLOR_TABBAR_TEXT               [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+
+#define COLOR_BACKGROUND_MENU           [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
+
+#define COLOR_BACKGROUND_PAGECONTROL    [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
+#define COLOR_PAGECONTROL_INDICATOR     [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
+
+#define COLOR_CRYPTOCLOUD               [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]
+
+#define COLOR_TEXT_ANTHRACITE           [UIColor colorWithRed:65.0/255.0 green:64.0/255.0 blue:66.0/255.0 alpha:1.0]                    // #414042
+
+#define COLOR_TEXT_NO_CONNECTION        [UIColor colorWithRed:204.0/255.0 green:204.0/255.0 blue:204.0/255.0 alpha:1.0]
+
+#define COLOR_SEPARATOR_TABLE           [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1]                   // iOS 7
 
 #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_NAVIGATIONBAR [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
-#define COLOR_NAVIGATIONBAR_TEXT [UIColor blackColor]
-#define COLOR_TABBAR [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
-#define COLOR_SEPARATOR_TABLE [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1]             // iOS 7
-#define COLOR_NO_CONNECTION [UIColor colorWithRed:204.0/255.0 green:204.0/255.0 blue:204.0/255.0 alpha:1.0]
 
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------

iOSClient/CCGlobal.m

@@ -39,15 +39,15 @@ NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";
 + (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden
 {
     nav.translucent = NO;
-    nav.barTintColor = COLOR_BRAND_NAVIGATIONBAR;
-    nav.tintColor = COLOR_BRAND_NAVIGATIONBAR_TEXT;
-    [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_BRAND_NAVIGATIONBAR_TEXT}];
+    nav.barTintColor = COLOR_NAVIGATIONBAR;
+    nav.tintColor = COLOR_NAVIGATIONBAR_TEXT;
+    [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_NAVIGATIONBAR_TEXT}];
 
     if (encrypted)
-        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_ENCRYPTED}];
+        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_CRYPTOCLOUD}];
     
     if (!online)
-        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_GRAY}];
+        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_TEXT_NO_CONNECTION}];
 
     nav.hidden = hidden;
     
@@ -58,7 +58,7 @@ NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";
 {    
     tab.translucent = NO;
     tab.barTintColor = COLOR_TABBAR;
-    tab.tintColor = COLOR_BRAND;
+    tab.tintColor = COLOR_TABBAR_TEXT;
     
     tab.hidden = hidden;
     

iOSClient/Intro/CCIntro.m

@@ -62,11 +62,11 @@
     EAIntroPage *page1 = [EAIntroPage page];
     page1.title = [CCUtility localizableBrand:@"_intro_01_" table:@"Intro"];
     page1.titlePositionY = titlePositionY;
-    page1.titleColor = COLOR_GRAY;
+    page1.titleColor = COLOR_TEXT_ANTHRACITE;
     page1.titleFont = [UIFont systemFontOfSize:20];
     page1.desc = [CCUtility localizableBrand:@"_intro_02_" table:@"Intro"];
     page1.descPositionY = descPositionY;
-    page1.descColor = COLOR_GRAY;
+    page1.descColor = COLOR_TEXT_ANTHRACITE;
     page1.descFont = [UIFont systemFontOfSize:14];
     page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1Nextcloud"]];
     page1.bgImage = [UIImage imageNamed:@"bgbianco"];

iOSClient/Library/MWPhotoBrowser/MWCaptionView.m

@@ -65,7 +65,7 @@ static const CGFloat labelPadding = 10;
     _label.lineBreakMode = NSLineBreakByWordWrapping;
 
     _label.numberOfLines = 0;
-    _label.textColor = COLOR_GRAY;
+    _label.textColor = COLOR_TEXT_ANTHRACITE;
     _label.font = [UIFont systemFontOfSize:12];
     if ([_photo respondsToSelector:@selector(caption)]) {
         _label.text = [_photo caption] ? [_photo caption] : @" ";

iOSClient/Library/MWPhotoBrowser/MWPhotoBrowser.m

@@ -226,9 +226,9 @@ static void * MWVideoPlayerObservation = &MWVideoPlayerObservation;
     }
     
     // color
-    self.navigationController.navigationBar.barTintColor = COLOR_BRAND_NAVIGATIONBAR;
-    self.navigationController.navigationBar.tintColor = COLOR_BRAND_NAVIGATIONBAR_TEXT;
-    [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_BRAND_NAVIGATIONBAR_TEXT}];
+    self.navigationController.navigationBar.barTintColor = COLOR_NAVIGATIONBAR;
+    self.navigationController.navigationBar.tintColor = COLOR_NAVIGATIONBAR_TEXT;
+    [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_NAVIGATIONBAR_TEXT}];
     
     // Toolbar items
     BOOL hasItems = NO;

iOSClient/Main/CCDetail.m

@@ -711,7 +711,7 @@
     if (progress == 0)
         [self.navigationController cancelCCProgress];
     else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:COLOR_BRAND];
+        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:COLOR_NAVIGATIONBAR_PROGRESS];
 }
 
 - (void)downloadPhotoBrowserFailure:(NSInteger)errorCode

iOSClient/Main/CCMain.m

@@ -555,7 +555,7 @@
         
         if ([app.reachability isReachable] == NO) {
             messageLabel.text = NSLocalizedString(@"_comm_erro_pull_down_", nil);
-            messageLabel.textColor = COLOR_NO_CONNECTION;
+            messageLabel.textColor = COLOR_TEXT_NO_CONNECTION;
             messageLabel.font = [UIFont systemFontOfSize:14];
         } else {
             messageLabel.text = NSLocalizedString(title ,nil);
@@ -595,7 +595,7 @@
     if ([app.listOfNotifications count] > 0) {
         
         buttonNotification = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:image_notification] style:UIBarButtonItemStylePlain target:self action:@selector(viewNotification)];
-        buttonNotification.tintColor = COLOR_BRAND;
+        buttonNotification.tintColor = COLOR_NAVIGATIONBAR_TEXT;
         buttonNotification.enabled = true;
     }
     
@@ -2230,9 +2230,9 @@
     viewController.delegate = self;
     viewController.move.title = NSLocalizedString(@"_move_", nil);
     viewController.selectedMetadatas = [self getMetadatasFromSelectedRows:indexPaths];
-    viewController.tintColor = COLOR_BRAND;
+    viewController.tintColor = COLOR_NAVIGATIONBAR_TEXT;
     viewController.barTintColor = COLOR_NAVIGATIONBAR;
-    viewController.tintColorTitle = COLOR_GRAY;
+    viewController.tintColorTitle = COLOR_NAVIGATIONBAR_TEXT;
     viewController.networkingOperationQueue = app.netQueue;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
@@ -2547,8 +2547,8 @@
         
         CCControlCenterCell *cell = (CCControlCenterCell *)[self.tableView cellForRowAtIndexPath:indexPath];
         
-        if (cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-        else cell.progressView.progressTintColor = COLOR_CLEAR;
+        if (cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+        else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
         
         cell.progressView.hidden = NO;
         [cell.progressView setProgress:progress];
@@ -3402,7 +3402,7 @@
     app.reMainMenu.separatorHeight = 0.5;
     app.reMainMenu.separatorColor = COLOR_SEPARATOR_TABLE;
     
-    app.reMainMenu.backgroundColor = COLOR_NAVIGATIONBAR;
+    app.reMainMenu.backgroundColor = COLOR_BACKGROUND_MENU;
     app.reMainMenu.textColor = [UIColor blackColor];
     app.reMainMenu.textAlignment = NSTextAlignmentLeft;
     app.reMainMenu.textShadowColor = nil;
@@ -3593,7 +3593,7 @@
     app.reSelectMenu.separatorHeight = 0.5;
     app.reSelectMenu.separatorColor = COLOR_SEPARATOR_TABLE;
     
-    app.reSelectMenu.backgroundColor = COLOR_NAVIGATIONBAR;
+    app.reSelectMenu.backgroundColor = COLOR_BACKGROUND_MENU;
     app.reSelectMenu.textColor = [UIColor blackColor];
     app.reSelectMenu.textAlignment = NSTextAlignmentLeft;
     app.reSelectMenu.textShadowColor = nil;
@@ -4034,7 +4034,7 @@
 
         viewController.title = NSLocalizedString(@"_passcode_protection_", nil);
         viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
         
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
         [self presentViewController:navigationController animated:YES completion:nil];
@@ -4114,10 +4114,10 @@
     
     actionSheet.automaticallyTintButtonImages = @(NO);
         
-    actionSheet.encryptedButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_ENCRYPTED };
-    actionSheet.buttonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_GRAY };
+    actionSheet.encryptedButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_CRYPTOCLOUD };
+    actionSheet.buttonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_TEXT_ANTHRACITE };
     actionSheet.cancelButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:COLOR_BRAND };
-    actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:COLOR_GRAY };
+    actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:COLOR_TEXT_ANTHRACITE };
     
     actionSheet.separatorColor = COLOR_SEPARATOR_TABLE;
     actionSheet.cancelButtonTitle = NSLocalizedString(@"_cancel_",nil);
@@ -4145,7 +4145,7 @@
         
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVIGATIONBAR
+                        backgroundColor: COLOR_BACKGROUND_MENU
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil
@@ -4313,7 +4313,7 @@
         
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVIGATIONBAR
+                        backgroundColor: COLOR_BACKGROUND_MENU
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil
@@ -4456,7 +4456,7 @@
      
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVIGATIONBAR
+                        backgroundColor: COLOR_BACKGROUND_MENU
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil
@@ -4872,7 +4872,7 @@
     // Title
     UILabel *titleLabel=[[UILabel alloc]initWithFrame:CGRectMake(10, -12, 0, 44)];
     titleLabel.backgroundColor=[UIColor clearColor];
-    titleLabel.textColor = COLOR_GRAY;
+    titleLabel.textColor = COLOR_TEXT_ANTHRACITE;
     titleLabel.font = [UIFont systemFontOfSize:12];
     titleLabel.textAlignment = NSTextAlignmentLeft;
     titleLabel.text = titleSection;
@@ -4883,7 +4883,7 @@
     // Elements
     UILabel *elementLabel=[[UILabel alloc]initWithFrame:CGRectMake(shift, -12, 0, 44)];
     elementLabel.backgroundColor=[UIColor clearColor];
-    elementLabel.textColor = COLOR_GRAY;
+    elementLabel.textColor = COLOR_TEXT_ANTHRACITE;
     elementLabel.font = [UIFont systemFontOfSize:12];
     elementLabel.textAlignment = NSTextAlignmentRight;
     elementLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
@@ -4975,10 +4975,10 @@
     
     // colori e font
     if (metadata.cryptated) {
-        cell.labelTitle.textColor = COLOR_ENCRYPTED;
+        cell.labelTitle.textColor = COLOR_CRYPTOCLOUD;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     } else {
-        cell.labelTitle.textColor = COLOR_CLEAR;
+        cell.labelTitle.textColor = COLOR_TEXT_ANTHRACITE;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     }
     
@@ -5212,8 +5212,8 @@
         float progress = [[app.listProgressMetadata objectForKey:metadata.fileID] floatValue];
         if (progress > 0) {
             
-            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-            else cell.progressView.progressTintColor = COLOR_CLEAR;
+            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+            else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
             
             cell.progressView.progress = progress;
             cell.progressView.hidden = NO;
@@ -5277,8 +5277,8 @@
         float progress = [[app.listProgressMetadata objectForKey:metadata.fileID] floatValue];
         if (progress > 0) {
             
-            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-            else cell.progressView.progressTintColor = COLOR_CLEAR;
+            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+            else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
             
             cell.progressView.progress = progress;
             cell.progressView.hidden = NO;
@@ -5428,7 +5428,7 @@
         
         viewController.title = _brand_;
         viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
 
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
             
@@ -5610,7 +5610,7 @@
             
             viewController.title = NSLocalizedString(@"_folder_blocked_", nil); 
             viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-            viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+            viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
             
             UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
             [self presentViewController:navController animated:YES completion:nil];

iOSClient/MenuAccount+ControlCenter/CCControlCenter.m

@@ -383,8 +383,8 @@
         
         CCControlCenterCell *cell = (CCControlCenterCell *)[_tableView cellForRowAtIndexPath:indexPath];
     
-        if (cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-        else cell.progressView.progressTintColor = COLOR_CLEAR;
+        if (cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+        else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
         
         cell.progressView.hidden = NO;
         [cell.progressView setProgress:progress];
@@ -599,7 +599,7 @@
     
     // title label on left
     UILabel *titleLabel=[[UILabel alloc]initWithFrame:CGRectMake(8, 3, 0, 13)];
-    titleLabel.textColor = COLOR_GRAY;
+    titleLabel.textColor = COLOR_TEXT_ANTHRACITE;
     titleLabel.font = [UIFont systemFontOfSize:9];
     titleLabel.textAlignment = NSTextAlignmentLeft;
     titleLabel.text = titleSection;
@@ -608,7 +608,7 @@
     
     // element (s) on right
     UILabel *elementLabel=[[UILabel alloc]initWithFrame:CGRectMake(-8, 3, 0, 13)];
-    elementLabel.textColor = COLOR_GRAY;
+    elementLabel.textColor = COLOR_TEXT_ANTHRACITE;
     elementLabel.font = [UIFont systemFontOfSize:9];
     elementLabel.textAlignment = NSTextAlignmentRight;
     elementLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
@@ -642,7 +642,7 @@
     UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
     
     UILabel *titleFooterLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, tableView.frame.size.width, 18)];
-    titleFooterLabel.textColor = COLOR_GRAY;
+    titleFooterLabel.textColor = COLOR_TEXT_ANTHRACITE;
     titleFooterLabel.font = [UIFont systemFontOfSize:12];
     titleFooterLabel.textAlignment = NSTextAlignmentCenter;
 
@@ -768,10 +768,10 @@
     
     // colori e font
     if (metadata.cryptated) {
-        cell.labelTitle.textColor = COLOR_ENCRYPTED;
+        cell.labelTitle.textColor = COLOR_CRYPTOCLOUD;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     } else {
-        cell.labelTitle.textColor = COLOR_CLEAR;
+        cell.labelTitle.textColor = COLOR_TEXT_ANTHRACITE;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     }
     
@@ -863,8 +863,8 @@
         float progress = [[app.listProgressMetadata objectForKey:metadata.fileID] floatValue];
         if (progress > 0) {
             
-            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-            else cell.progressView.progressTintColor = COLOR_CLEAR;
+            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+            else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
             
             cell.progressView.progress = progress;
             cell.progressView.hidden = NO;
@@ -928,8 +928,8 @@
         float progress = [[app.listProgressMetadata objectForKey:metadata.fileID] floatValue];
         if (progress > 0) {
             
-            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_ENCRYPTED;
-            else cell.progressView.progressTintColor = COLOR_CLEAR;
+            if (metadata.cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
+            else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
             
             cell.progressView.progress = progress;
             cell.progressView.hidden = NO;

iOSClient/Move/CCMove.m

@@ -98,7 +98,7 @@
         UILabel* label = [[UILabel alloc] initWithFrame:CGRectMake(0,0, self.navigationItem.titleView.frame.size.width, 40)];
         label.text = self.passMetadata.fileNamePrint;
         
-        if (self.passMetadata.cryptated) label.textColor = COLOR_ENCRYPTED;
+        if (self.passMetadata.cryptated) label.textColor = COLOR_CRYPTOCLOUD;
         else label.textColor = self.tintColorTitle;
         
         label.backgroundColor =[UIColor clearColor];
@@ -422,9 +422,9 @@
     
     // colors
     if (metadata.cryptated) {
-        cell.textLabel.textColor = COLOR_ENCRYPTED;
+        cell.textLabel.textColor = COLOR_CRYPTOCLOUD;
     } else {
-        cell.textLabel.textColor = COLOR_CLEAR;
+        cell.textLabel.textColor = COLOR_TEXT_ANTHRACITE;
     }
     
     cell.detailTextLabel.text = @"";
@@ -485,7 +485,7 @@
             
             viewController.title = NSLocalizedString(@"_folder_blocked_", nil);
             viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-            viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+            viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
             
             UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
             [self presentViewController:navController animated:YES completion:nil];

iOSClient/Offline/CCOfflinePageContent.m

@@ -252,10 +252,10 @@
     
     actionSheet.automaticallyTintButtonImages = @(NO);
     
-    actionSheet.encryptedButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_ENCRYPTED };
-    actionSheet.buttonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_GRAY };
+    actionSheet.encryptedButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_CRYPTOCLOUD };
+    actionSheet.buttonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:COLOR_TEXT_ANTHRACITE };
     actionSheet.cancelButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:COLOR_BRAND };
-    actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:COLOR_GRAY };
+    actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:COLOR_TEXT_ANTHRACITE };
     
     actionSheet.separatorColor = COLOR_SEPARATOR_TABLE;
     actionSheet.cancelButtonTitle = NSLocalizedString(@"_cancel_",nil);
@@ -505,10 +505,10 @@
     
     // color and font
     if (metadata.cryptated) {
-        cell.labelTitle.textColor = COLOR_ENCRYPTED;
+        cell.labelTitle.textColor = COLOR_CRYPTOCLOUD;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     } else {
-        cell.labelTitle.textColor = COLOR_CLEAR;
+        cell.labelTitle.textColor = COLOR_TEXT_ANTHRACITE;
         cell.labelInfoFile.textColor = [UIColor blackColor];
     }
     

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -579,7 +579,7 @@
         [self getGeoLocationForSection:indexPath.section];
         
         UILabel *titleLabel = (UILabel *)[headerView viewWithTag:100];
-        titleLabel.textColor = COLOR_GRAY;
+        titleLabel.textColor = COLOR_TEXT_ANTHRACITE;
         titleLabel.text = [CCUtility getTitleSectionDate:[_sectionDataSource.sections objectAtIndex:indexPath.section]];
 
         return headerView;

iOSClient/QuickActions/CCQuickActions.m

@@ -187,9 +187,9 @@
 
     _move.delegate = self;
     _move.selectedMetadatas = nil;
-    _move.tintColor = COLOR_BRAND;
+    _move.tintColor = COLOR_NAVIGATIONBAR_TEXT;
     _move.barTintColor = COLOR_NAVIGATIONBAR;
-    _move.tintColorTitle = COLOR_GRAY;
+    _move.tintColorTitle = COLOR_NAVIGATIONBAR_TEXT;
     _move.networkingOperationQueue = app.netQueue;
     
     [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];

iOSClient/Settings/Acknowledgements.m

@@ -30,6 +30,8 @@
 {
     [super viewDidLoad];
     
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
+    
     NSURL *rtfPath;
     
     //NSString * language = [[NSLocale preferredLanguages] objectAtIndex:0];
@@ -42,7 +44,6 @@
     self.txtTermini.attributedText = attributedStringWithRtf;
     
     self.automaticallyAdjustsScrollViewInsets = NO;
-    [self.navigationController.navigationBar setTintColor:COLOR_BRAND];
     self.view.backgroundColor = [UIColor whiteColor];
     self.title = NSLocalizedString(@"_acknowledgements_", nil);
     self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(cancelPressed)];

iOSClient/Settings/CCManageCryptoCloud.m

@@ -108,7 +108,7 @@
     viewController.title = NSLocalizedString(@"_key_aes_256_", nil);
     
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
     [self presentViewController:navigationController animated:YES completion:nil];
@@ -127,7 +127,7 @@
     viewController.title = NSLocalizedString(@"_check_key_aes_256_", nil);
     
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
     [self presentViewController:navigationController animated:YES completion:nil];

iOSClient/Settings/CCManageCryptoCloudSecurity.m

@@ -55,7 +55,7 @@
         
         // mail
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"mail" rowType:XLFormRowDescriptorTypeEmail title:NSLocalizedString(@"_email_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         [section addFormRow:row];
@@ -66,7 +66,7 @@
         // Send aes-256 password via mail
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendmailencryptpass" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_encryptpass_by_email_", nil)];
         [row.cellConfig setObject:@(NSTextAlignmentCenter) forKey:@"textLabel.textAlignment"];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textLabel.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textLabel.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIImage imageNamed:image_settingsKeyMail] forKey:@"imageView.image"];
         row.action.formSelector = @selector(sendMailEncryptPass:);
@@ -78,7 +78,7 @@
         
         // hint
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"hint" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_hint_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [CCUtility getHint];

iOSClient/Settings/CCSettings.m

@@ -450,7 +450,7 @@
     viewController.title = NSLocalizedString(@"_check_key_aes_256_", nil);
     
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
     [self presentViewController:navigationController animated:YES completion:nil];
@@ -481,7 +481,7 @@
     viewController.touchIDManager = touchIDManager;
     
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+    viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     
     UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
     [self presentViewController:navigationController animated:YES completion:nil];
@@ -516,7 +516,7 @@
         viewController.title = NSLocalizedString(@"_passcode_activate_", nil);
         
         viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
                
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
         [self presentViewController:navigationController animated:YES completion:nil];
@@ -548,7 +548,7 @@
         viewController.title = NSLocalizedString(@"_disabling_passcode_", nil);
             
         viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_ENCRYPTED;
+        viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
         
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:viewController];
         [self presentViewController:navigationController animated:YES completion:nil];

iOSClient/Templates/CCAccountWeb.m

@@ -67,7 +67,7 @@
         
         // Title
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -79,7 +79,7 @@
         
         // url
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"url" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_url:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"url"];
@@ -87,7 +87,7 @@
         
         // Login
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"login" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_login:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"login"];
@@ -95,7 +95,7 @@
         
         // Password
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"password" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_password:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"password"];
@@ -107,7 +107,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
 

iOSClient/Templates/CCBancomat.m

@@ -67,7 +67,7 @@
         
         // Title
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -79,7 +79,7 @@
         
         // Nome Banca
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"nomebanca" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_bank_name:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"nomebanca"];
@@ -87,7 +87,7 @@
 
         // CODE
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"code" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_code:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"code"];
@@ -95,7 +95,7 @@
         
         // Secur Code
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"securcode" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_security_code:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"securcode"];
@@ -103,7 +103,7 @@
 
         // PIN
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"pin" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_pin:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"pin"];
@@ -115,7 +115,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
 

iOSClient/Templates/CCCartaDiCredito.m

@@ -68,7 +68,7 @@
         
         // Titolo
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -80,7 +80,7 @@
         
         // Nome Banca
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"nomebanca" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_bank_name:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"nomebanca"];
@@ -88,7 +88,7 @@
 
         // CODE
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"code" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_code:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"code"];
@@ -96,7 +96,7 @@
         
         // Secur Code
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"securcode" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_security_code:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"securcode"];
@@ -104,7 +104,7 @@
 
         // PIN
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"pin" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_pin:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"pin"];
@@ -112,7 +112,7 @@
         
         // Nome Conognome
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"nomecognome" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_name_surname:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"nomecognome"];
@@ -120,7 +120,7 @@
         
         // Scadenza
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"scadenza" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_expiry_date:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"scadenza"];
@@ -132,7 +132,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
 

iOSClient/Templates/CCCartaIdentita.m

@@ -68,7 +68,7 @@
         
         // Titolo
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -80,7 +80,7 @@
         
         // Nome Cognome
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"comecognome" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_name_surname:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"comecognome"];
@@ -88,7 +88,7 @@
         
         // Numero
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"numero" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_number:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"numero"];
@@ -96,7 +96,7 @@
 
         // Luogo di nascita
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"luogonascita" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_place_of_birth:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"luogonascita"];
@@ -104,7 +104,7 @@
 
         // Data di nascita
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datanascita" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_birth:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datanascita"];
@@ -112,7 +112,7 @@
 
         // Data di rilascio
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datarilascio" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_issue:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datarilascio"];
@@ -120,7 +120,7 @@
         
         // Data di scadenza
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datascadenza" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_expiry:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datascadenza"];
@@ -132,7 +132,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
     

iOSClient/Templates/CCContoCorrente.m

@@ -67,7 +67,7 @@
         
         // Title
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -79,7 +79,7 @@
         
         // Nome Banca
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"nomebanca" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_bank_name:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"nomebanca"];
@@ -87,7 +87,7 @@
         
         // Nome Conognome
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"nomecognome" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_name_surname:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"nomecognome"];
@@ -95,7 +95,7 @@
         
         // Numero Conto
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"numeroconto" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_account_n:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"numeroconto"];
@@ -103,7 +103,7 @@
 
         // IBAN
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"iban" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_iban:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"iban"];
@@ -111,7 +111,7 @@
         
         // SWIFT
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"swift" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_swift:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"swift"];
@@ -119,7 +119,7 @@
 
         // Filiale
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"filiale" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_agency:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"filiale"];
@@ -131,7 +131,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
 

iOSClient/Templates/CCPassaporto.m

@@ -68,7 +68,7 @@
         
         // Title
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -80,7 +80,7 @@
         
         // Nome Cognome
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"comecognome" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_name_surname:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"comecognome"];
@@ -88,7 +88,7 @@
         
         // Numero
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"numero" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_number:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"numero"];
@@ -96,7 +96,7 @@
 
         // Luogo di nascita
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"luogonascita" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_place_of_birth:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"luogonascita"];
@@ -104,7 +104,7 @@
 
         // Data di nascita
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datanascita" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_birth:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datanascita"];
@@ -112,7 +112,7 @@
         
         // Data di rilascio
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datarilascio" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_issue:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datarilascio"];
@@ -120,7 +120,7 @@
         
         // Data di scadenza
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datascadenza" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_expiry:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datascadenza"];
@@ -132,7 +132,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
     

iOSClient/Templates/CCPatenteGuida.m

@@ -70,7 +70,7 @@
         
         // Titolo
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"titolo" rowType:XLFormRowDescriptorTypeText];
-        [row.cellConfig setObject:COLOR_ENCRYPTED forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"titolo"];
@@ -82,7 +82,7 @@
         
         // Nome Cognome
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"comecognome" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_name_surname:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"comecognome"];
@@ -90,7 +90,7 @@
         
         // Numero
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"numero" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_license_number:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"numero"];
@@ -98,7 +98,7 @@
 
         // Data di rilascio
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datarilascio" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_issue:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datarilascio"];
@@ -106,7 +106,7 @@
         
         // Data di scadenza
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"datascadenza" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_date_of_expiry:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"datascadenza"];
@@ -114,7 +114,7 @@
         
         // Tipi di veicolo
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"tipiveicolo" rowType:XLFormRowDescriptorTypeText title:NSLocalizedString(@"_vehicle_types:_", nil)];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textField.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textField.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textField.font"];
         row.value = [field objectForKey:@"tipiveicolo"];
@@ -126,7 +126,7 @@
         // Note
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"note" rowType:XLFormRowDescriptorTypeTextView];
         row.value = [field objectForKey:@"note"];
-        [row.cellConfig setObject:COLOR_GRAY forKey:@"textView.textColor"];
+        [row.cellConfig setObject:COLOR_TEXT_ANTHRACITE forKey:@"textView.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textView.font"];
         [section addFormRow:row];
     

iOSClient/Templates/CCTemplates.m

@@ -33,7 +33,7 @@
 {
     UILabel* label=[[UILabel alloc] initWithFrame:CGRectMake(0,0, navItem.titleView.frame.size.width, 40)];
     label.text=titolo;
-    if (!reachability) label.textColor = COLOR_NO_CONNECTION;
+    if (!reachability) label.textColor = COLOR_TEXT_NO_CONNECTION;
     else label.textColor = [UIColor blackColor];
     label.backgroundColor =[UIColor clearColor];
     label.textAlignment = NSTextAlignmentCenter;

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -167,9 +167,9 @@
     CCMove *viewController = (CCMove *)navigationController.topViewController;
     viewController.delegate = self;
     viewController.move.title = NSLocalizedString(@"_select_", nil);
-    viewController.tintColor = COLOR_BRAND;
+    viewController.tintColor = COLOR_NAVIGATIONBAR_TEXT;
     viewController.barTintColor = COLOR_NAVIGATIONBAR;
-    viewController.tintColorTitle = COLOR_GRAY;
+    viewController.tintColorTitle = COLOR_NAVIGATIONBAR_TEXT;
     viewController.networkingOperationQueue = app.netQueue;
 
     [self presentViewController:navigationController animated:YES completion:nil];