Theming

iOSClient/AppDelegate.m

@@ -995,17 +995,18 @@
 
 - (void)changeTheming:(UIViewController *)vc
 {
+    UIColor *color = [NCBrandColor sharedInstance].brand;
+    
     // Change Navigation & TabBar color
-    vc.navigationController.navigationBar.barTintColor = [NCBrandColor sharedInstance].brand;
-    vc.tabBarController.tabBar.barTintColor = [NCBrandColor sharedInstance].tabBar;
-    vc.tabBarController.tabBar.tintColor = [NCBrandColor sharedInstance].brand;
+    vc.navigationController.navigationBar.barTintColor = color;
+    vc.tabBarController.tabBar.tintColor = color;
     
     // Change button Plus
     UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController;
     UITabBarController *tabBarController = [splitViewController.viewControllers firstObject];
     
     UIButton *button = [tabBarController.view viewWithTag:99];
-    UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] color:[NCBrandColor sharedInstance].brand];
+    UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] color:color];
     
     [button setBackgroundImage:buttonImage forState:UIControlStateNormal];
     [button setBackgroundImage:buttonImage forState:UIControlStateHighlighted];

iOSClient/Main/CCMain.m

@@ -1201,9 +1201,11 @@
 
 - (void)getCapabilitiesOfServerSuccess:(OCCapabilities *)capabilities
 {
+    // Update capabilities db
+    [CCCoreData addCapabilities:capabilities account:app.activeAccount];
+    
     // Change Theming color
     [app settingThemingColorBrand];
-    [CCCoreData addCapabilities:capabilities account:app.activeAccount];
     
     // Download Theming Background
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{

iOSClient/Main/CCMore.swift

@@ -207,7 +207,9 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     
     func changeTheming() {
         
-        appDelegate.changeTheming(self)
+        if (self.isViewLoaded && (self.view.window != nil)) {
+            appDelegate.changeTheming(self)
+        }
     }
     
     func numberOfSections(in tableView: UITableView) -> Int {