Marino Faggiana 8 years ago
parent
commit
64b6891b64

+ 5 - 6
iOSClient/Share/CCShareOC.m

@@ -115,11 +115,11 @@
 {
     [super viewDidLoad];
     
-    // Color
-    [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];
+    self.view.backgroundColor = COLOR_NAVIGATIONBAR;
+    
+    [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
+    self.endButton.tintColor = COLOR_NAVIGATIONBAR_TEXT;
     
     [self reloadData];
     
@@ -127,8 +127,7 @@
     else self.fileImageView.image = [UIImage imageNamed:self.metadata.iconName];
     
     self.labelTitle.text = self.metadata.fileNamePrint;
-    [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
-    self.endButton.tintColor = [COLOR_BRAND colorWithAlphaComponent:0.8];
+    self.labelTitle.textColor = COLOR_NAVIGATIONBAR_TEXT;
     
     self.tableView.tableHeaderView = ({UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 0.1 / UIScreen.mainScreen.scale)];
         line.backgroundColor = self.tableView.separatorColor;

+ 3 - 7
iOSClient/Share/CCSharePermissionOC.m

@@ -146,16 +146,12 @@
 {
     [super viewDidLoad];
     
-    // Color
-    [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];
+    self.view.backgroundColor = COLOR_NAVIGATIONBAR;
     
-    // Done
     [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
-    self.endButton.tintColor = [COLOR_BRAND colorWithAlphaComponent:0.8];
+    self.endButton.tintColor = COLOR_NAVIGATIONBAR_TEXT;
     
-    [self.view setTintColor:COLOR_BRAND];
-        
     shareDto = [app.sharesID objectForKey:self.idRemoteShared];
         
     [self initializeForm];    

+ 3 - 7
iOSClient/Share/CCShareUserOC.m

@@ -96,15 +96,11 @@
     
     self.selectedItems = [[NSMutableArray alloc] init];
     
-    // Color
-    [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];
+    self.view.backgroundColor = COLOR_NAVIGATIONBAR;
     
-    // Done
     [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
-    self.endButton.tintColor = [COLOR_BRAND colorWithAlphaComponent:0.8];
-    
-    [self.view setTintColor:COLOR_BRAND];
+    self.endButton.tintColor = COLOR_NAVIGATIONBAR_TEXT;
 }
 
 #pragma --------------------------------------------------------------------------------------------