Browse Source

clear code

Marino Faggiana 8 years ago
parent
commit
86d3ed8596
3 changed files with 5 additions and 14 deletions
  1. 4 10
      iOSClient/AppDelegate.m
  2. 1 1
      iOSClient/Brand/NCBrandConstant.h
  3. 0 3
      iOSClient/Utility/CCGraphics.m

+ 4 - 10
iOSClient/AppDelegate.m

@@ -864,16 +864,6 @@
 
 - (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden
 {
-    if (app.activeAccount.length > 0 && k_option_use_themingColor == YES) {
-        
-        TableCapabilities *capabilities = [CCCoreData getCapabilitesForAccount:app.activeAccount];
-        if (capabilities.themingColor.length > 0) {
-            
-            UIColor *themingColor = [CCGraphics colorFromHexString:capabilities.themingColor];
-            NCBrandColor.sharedInstance.brand = themingColor;
-        }
-    }
-    
     nav.translucent = NO;
     nav.barTintColor = [NCBrandColor sharedInstance].brand;
     nav.tintColor = [NCBrandColor sharedInstance].navigationBarText;
@@ -1616,6 +1606,10 @@
     if (([actualVersion compare:@"2.17.1" options:NSNumericSearch] == NSOrderedAscending)) {
         
     }
+    
+    if (([actualVersion compare:@"2.17.2" options:NSNumericSearch] == NSOrderedAscending)) {
+        
+    }
 }
 
 @end

+ 1 - 1
iOSClient/Brand/NCBrandConstant.h

@@ -1,6 +1,6 @@
 //
 //  NCBrandConstant.h
-//  Nextcloud
+//  Crypto Cloud Technology Nextcloud
 //
 //  Created by Marino Faggiana on 06/03/17.
 //  Copyright © 2017 TWS. All rights reserved.

+ 0 - 3
iOSClient/Utility/CCGraphics.m

@@ -275,9 +275,6 @@
 
 + (UIImage *)changeThemingColorImage:(UIImage *)image color:(UIColor *)color
 {
-    if (k_option_use_themingColor == NO)
-        return image;
-    
     CGRect rect = CGRectMake(0, 0, image.size.width*2, image.size.height*2);
     UIGraphicsBeginImageContext(rect.size);
     CGContextRef context = UIGraphicsGetCurrentContext();