new settings for color

Nextcloud.xcodeproj/project.pbxproj

@@ -4457,7 +4457,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NC";
-				SWIFT_OBJC_BRIDGING_HEADER = "PickerFileProvider-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "PickerFileProvider/PickerFileProvider-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -4488,7 +4488,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = NC;
-				SWIFT_OBJC_BRIDGING_HEADER = "PickerFileProvider-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "PickerFileProvider/PickerFileProvider-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

Share Ext/ShareViewController.m

@@ -166,7 +166,7 @@
     barTintColor = self.navigationController.navigationBar.barTintColor;
     tintColor = self.navigationController.navigationBar.tintColor;
     
-    if (barTintColor == nil) barTintColor = COLOR_NAVBAR_IOS7;
+    if (barTintColor == nil) barTintColor = COLOR_NAVIGATIONBAR;
     if (tintColor == nil) tintColor  = COLOR_GRAY;
     
     // Toolbar Color & navigationBar Color

iOSClient/AppDelegate.m

@@ -168,7 +168,7 @@
     UIPageControl *pageControl = [UIPageControl appearance];
     pageControl.pageIndicatorTintColor = [UIColor whiteColor];
     pageControl.currentPageIndicatorTintColor = COLOR_NEXTCLOUD;
-    pageControl.backgroundColor = COLOR_NAVBAR_IOS7; //[UIColor clearColor];
+    pageControl.backgroundColor = COLOR_NAVIGATIONBAR;
     
     // remove tmp & cache
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{

iOSClient/CCGlobal.h

@@ -261,14 +261,19 @@ extern NSString *const BKPasscodeKeychainServiceName;
 // COLOR
 // -----------------------------------------------------------------------------------------------------------
 
-// NEXTCLOUD COLOR
+// 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_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]
+
 #endif
 
 // GENERAL COLOR
@@ -278,10 +283,11 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #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_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]
-#define COLOR_NAVBAR_IOS7 [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1.0]
 
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------
@@ -289,7 +295,7 @@ extern NSString *const BKPasscodeKeychainServiceName;
 
 @interface CCAspect : NSObject
 
-+ (void)aspectNavigationControllerBar:(UINavigationBar *)nav hidden:(BOOL)hidden;
++ (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden;
 + (void)aspectTabBar:(UITabBar *)tab hidden:(BOOL)hidden;
 
 @end

iOSClient/CCGlobal.m

@@ -36,12 +36,19 @@ NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";
 
 @implementation CCAspect
 
-+ (void)aspectNavigationControllerBar:(UINavigationBar *)nav hidden:(BOOL)hidden
++ (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden
 {
     nav.translucent = NO;
-    nav.barTintColor = COLOR_BAR;
-    nav.tintColor = COLOR_BRAND;
+    nav.barTintColor = COLOR_BRAND_NAVIGATIONBAR;
+    nav.tintColor = COLOR_BRAND_NAVIGATIONBAR_TEXT;
+    [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_BRAND_NAVIGATIONBAR_TEXT}];
+
+    if (encrypted)
+        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_ENCRYPTED}];
     
+    if (!online)
+        [nav setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_GRAY}];
+
     nav.hidden = hidden;
     
     [nav setAlpha:1];
@@ -50,7 +57,7 @@ NSString *const BKPasscodeKeychainServiceName = @"Crypto Cloud";
 + (void)aspectTabBar:(UITabBar *)tab hidden:(BOOL)hidden
 {    
     tab.translucent = NO;
-    tab.barTintColor = COLOR_BAR;
+    tab.barTintColor = COLOR_TABBAR;
     tab.tintColor = COLOR_BRAND;
     
     tab.hidden = hidden;

iOSClient/Main/CCDetail.m

@@ -222,7 +222,8 @@
         self.edgesForExtendedLayout = UIRectEdgeBottom;
         [self viewAudio];
         [self createToolbar];
-        [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+        [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
+
     }
     
     if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_document]) {
@@ -234,14 +235,14 @@
             self.edgesForExtendedLayout = UIRectEdgeBottom;
             [self viewPDF:@""];
             [self createToolbar];
-            [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
-            
+            [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
+
         } else {
 
             self.edgesForExtendedLayout = UIRectEdgeBottom;
             [self viewDocument];
             [self createToolbar];
-            [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+            [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
         }
     }
 }

iOSClient/Main/CCMain.m

@@ -211,7 +211,7 @@
     [[CCNetworking sharedNetworking] settingDelegate:self];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Menu e Bar
@@ -481,12 +481,7 @@
         return;
 
     // Color text self.navigationItem.title
-    if ([app.reachability isReachable] == NO)
-        [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_NO_CONNECTION}];
-    else if (_isFolderEncrypted)
-        [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_ENCRYPTED}];
-    else
-        [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_GRAY}];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
 
     if (_isSelectedMode) {
         
@@ -585,7 +580,7 @@
 
 - (void)setUINavigationBarDefault
 {
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
     
     UIBarButtonItem *buttonMore, *buttonNotification;
     
@@ -617,7 +612,7 @@
 
 - (void)setUINavigationBarSelected
 {
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
     
     UIImage *icon = [UIImage imageNamed:image_more];
     UIBarButtonItem *buttonMore = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(toggleReSelectMenu)];
@@ -2236,7 +2231,7 @@
     viewController.move.title = NSLocalizedString(@"_move_", nil);
     viewController.selectedMetadatas = [self getMetadatasFromSelectedRows:indexPaths];
     viewController.tintColor = COLOR_BRAND;
-    viewController.barTintColor = COLOR_BAR;
+    viewController.barTintColor = COLOR_NAVIGATIONBAR;
     viewController.tintColorTitle = COLOR_GRAY;
     viewController.networkingOperationQueue = app.netQueue;
     
@@ -3407,7 +3402,7 @@
     app.reMainMenu.separatorHeight = 0.5;
     app.reMainMenu.separatorColor = COLOR_SEPARATOR_TABLE;
     
-    app.reMainMenu.backgroundColor = COLOR_BAR;
+    app.reMainMenu.backgroundColor = COLOR_NAVIGATIONBAR;
     app.reMainMenu.textColor = [UIColor blackColor];
     app.reMainMenu.textAlignment = NSTextAlignmentLeft;
     app.reMainMenu.textShadowColor = nil;
@@ -3598,7 +3593,7 @@
     app.reSelectMenu.separatorHeight = 0.5;
     app.reSelectMenu.separatorColor = COLOR_SEPARATOR_TABLE;
     
-    app.reSelectMenu.backgroundColor = COLOR_BAR;
+    app.reSelectMenu.backgroundColor = COLOR_NAVIGATIONBAR;
     app.reSelectMenu.textColor = [UIColor blackColor];
     app.reSelectMenu.textAlignment = NSTextAlignmentLeft;
     app.reSelectMenu.textShadowColor = nil;
@@ -4150,7 +4145,7 @@
         
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVBAR_IOS7
+                        backgroundColor: COLOR_NAVIGATIONBAR
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil
@@ -4318,7 +4313,7 @@
         
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVBAR_IOS7
+                        backgroundColor: COLOR_NAVIGATIONBAR
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil
@@ -4461,7 +4456,7 @@
      
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: iconHeader
-                        backgroundColor: COLOR_NAVBAR_IOS7
+                        backgroundColor: COLOR_NAVIGATIONBAR
                                  height: 50.0
                                    type: AHKActionSheetButtonTypeDisabled
                                 handler: nil

iOSClient/Offline/CCOffline.m

@@ -94,7 +94,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Plus Button

iOSClient/Offline/CCOfflinePageContent.m

@@ -65,7 +65,7 @@
         _serverUrl = [CCUtility getDirectoryLocal];
     }
     
-    // Title
+    // Title & color
     self.title = _titleViewControl;
 }
 
@@ -75,7 +75,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Plus Button

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -86,7 +86,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Plus Button
@@ -120,7 +120,7 @@
 
 - (void)setUINavigationBarDefault
 {
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     
     // select
     UIImage *icon = [UIImage imageNamed:image_seleziona];

iOSClient/QuickActions/CCQuickActions.m

@@ -188,7 +188,7 @@
     _move.delegate = self;
     _move.selectedMetadatas = nil;
     _move.tintColor = COLOR_BRAND;
-    _move.barTintColor = COLOR_BAR;
+    _move.barTintColor = COLOR_NAVIGATIONBAR;
     _move.tintColorTitle = COLOR_GRAY;
     _move.networkingOperationQueue = app.netQueue;
     

iOSClient/Settings/Acknowledgements.m

@@ -22,6 +22,7 @@
 //
 
 #import "Acknowledgements.h"
+#import "AppDelegate.h"
 
 @implementation Acknowledgements
 
@@ -53,7 +54,7 @@
     [super viewDidAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     
     [self.txtTermini setContentOffset:CGPointZero animated:NO];
     self.txtTermini.hidden = false;

iOSClient/Settings/CCManageAccount.m

@@ -93,8 +93,8 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];    
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
+    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 
 // E' apparsa

iOSClient/Settings/CCManageCameraUpload.m

@@ -193,7 +193,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     //

iOSClient/Settings/CCManageCryptoCloud.m

@@ -77,7 +77,7 @@
     [super viewDidLoad];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 
@@ -87,7 +87,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     [self reloadForm];

iOSClient/Settings/CCManageCryptoCloudSecurity.m

@@ -99,7 +99,7 @@
     
     self.navigationItem.title = NSLocalizedString(@"_title_form_security_init_", nil);
     
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 -(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue

iOSClient/Settings/CCManageHelp.m

@@ -23,6 +23,7 @@
 
 #import "CCManageHelp.h"
 #import "CCUtility.h"
+#import "AppDelegate.h"
 
 @interface CCManageHelp ()
 
@@ -70,7 +71,7 @@
     [super viewDidLoad];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Intro
@@ -83,7 +84,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 

iOSClient/Settings/CCManageOptimizations.m

@@ -23,6 +23,7 @@
 
 #import "CCManageOptimizations.h"
 #import "CCUtility.h"
+#import "AppDelegate.h"
 
 @implementation CCManageOptimizations
 
@@ -78,7 +79,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 

iOSClient/Settings/CCSettings.m

@@ -263,7 +263,7 @@
     self.title = NSLocalizedString(@"_settings_", nil);
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 
@@ -273,7 +273,7 @@
     [super viewWillAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     [self reloadForm];

iOSClient/Share/CCShareInfoCMOC.m

@@ -137,7 +137,7 @@
     [super viewDidLoad];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Done

iOSClient/Share/CCShareOC.m

@@ -116,7 +116,7 @@
     [super viewDidLoad];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     [self.view setTintColor:COLOR_BRAND];

iOSClient/Share/CCSharePermissionOC.m

@@ -147,7 +147,7 @@
     [super viewDidLoad];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Done

iOSClient/Share/CCShareUserOC.m

@@ -97,7 +97,7 @@
     self.selectedItems = [[NSMutableArray alloc] init];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     // Done

iOSClient/Templates/CCAccountWeb.m

@@ -128,7 +128,7 @@
     [templates setImageTitle:NSLocalizedString(@"_web_account_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCBancomat.m

@@ -135,7 +135,7 @@
     [templates setImageTitle:NSLocalizedString(@"_atm_card_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCCartaDiCredito.m

@@ -153,7 +153,7 @@
     [templates setImageTitle:NSLocalizedString(@"_credit_card_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCCartaIdentita.m

@@ -152,7 +152,7 @@
     [templates setImageTitle:NSLocalizedString(@"_id_card_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCContoCorrente.m

@@ -152,7 +152,7 @@
     [templates setImageTitle:NSLocalizedString(@"_bank_account_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCNote.m

@@ -90,7 +90,7 @@
     [templates setImageTitle:self.titolo conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     
     self.view.backgroundColor = [UIColor whiteColor];
 }

iOSClient/Templates/CCPassaporto.m

@@ -152,7 +152,7 @@
     [templates setImageTitle:NSLocalizedString(@"_passport_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/Templates/CCPatenteGuida.m

@@ -146,7 +146,7 @@
     [templates setImageTitle:NSLocalizedString(@"_driving_license_", nil) conNavigationItem:self.navigationItem reachability:[app.reachability isReachable]];
         
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
 }
 
 - (void)viewDidAppear:(BOOL)animated

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -56,7 +56,7 @@
     [super viewDidAppear:animated];
     
     // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
+    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     [self.tableView reloadData];
@@ -168,7 +168,7 @@
     viewController.delegate = self;
     viewController.move.title = NSLocalizedString(@"_select_", nil);
     viewController.tintColor = COLOR_BRAND;
-    viewController.barTintColor = COLOR_BAR;
+    viewController.barTintColor = COLOR_NAVIGATIONBAR;
     viewController.tintColorTitle = COLOR_GRAY;
     viewController.networkingOperationQueue = app.netQueue;