Theming

iOSClient/Activity/CCActivity.m

@@ -105,9 +105,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 - (void)didReceiveMemoryWarning {

iOSClient/AppDelegate.h

@@ -159,7 +159,9 @@
 - (void)aspectNavigationControllerBar:(UINavigationBar *)nav encrypted:(BOOL)encrypted online:(BOOL)online hidden:(BOOL)hidden;
 - (void)aspectTabBar:(UITabBar *)tab hidden:(BOOL)hidden;
 - (void)plusButtonVisibile:(BOOL)visible;
+
 - (void)settingThemingColor;
+- (void)changeTheming:(UIViewController *)vc;
 
 // Operation Networking
 - (void)cancelAllOperations;

iOSClient/AppDelegate.m

@@ -845,9 +845,7 @@
     item.selectedImage = [UIImage imageNamed:image_tabBarMore];
     
     // Plus Button
-    // "PlusClear" "tabBarPlusNextcloud"
-    UIImage *buttonImage = [UIImage imageNamed:@"tabBarPlusNextcloud"];
-    //UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:image_tabBarPlus] color:[NCBrandColor sharedInstance].brand];
+    UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] color:[NCBrandColor sharedInstance].brand];
     UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
     button.tag = 99;
     button.frame = CGRectMake(0.0, 0.0, buttonImage.size.width, buttonImage.size.height);
@@ -1001,6 +999,24 @@
     [self.window setTintColor:[NCBrandColor sharedInstance].brand];
 }
 
+- (void)changeTheming:(UIViewController *)vc
+{
+    // 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;
+    
+    // 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];
+    
+    [button setBackgroundImage:buttonImage forState:UIControlStateNormal];
+    [button setBackgroundImage:buttonImage forState:UIControlStateHighlighted];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Media Player Control =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Favorites/CCFavorites.m

@@ -102,9 +102,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 - (void)triggerProgressTask:(NSNotification *)notification

iOSClient/Images.xcassets/PlusClear.imageset/Contents.json → iOSClient/Images.xcassets/tabBarPlus.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "PlusClearpng.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "PlusClear@3x.png",
       "scale" : "3x"
     }
   ],

iOSClient/Local storage/CCLocalStorage.m

@@ -95,9 +95,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/CCDetail.m

@@ -195,10 +195,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    self.navigationController.navigationBar.barTintColor = [NCBrandColor sharedInstance].brand;
-    self.tabBarController.tabBar.barTintColor = [NCBrandColor sharedInstance].tabBar;
-    self.tabBarController.tabBar.tintColor = [NCBrandColor sharedInstance].brand;
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/CCMain.m

@@ -312,9 +312,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:_isFolderEncrypted online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
     
     // Menu e Bar
     [self createReMainMenu];

iOSClient/Main/CCMore.swift

@@ -207,9 +207,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
     
     func changeTheming() {
         
-        // Navigation & TabBar color
-        appDelegate.aspectNavigationControllerBar(self.navigationController?.navigationBar, encrypted: false, online: appDelegate.reachability.isReachable(), hidden: false)
-        appDelegate.aspectTabBar(self.tabBarController?.tabBar, hidden: false)
+        appDelegate.changeTheming(self)
     }
     
     func numberOfSections(in tableView: UITableView) -> Int {

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -109,9 +109,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Settings/CCAdvanced.m

@@ -145,9 +145,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 - (void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue

iOSClient/Settings/CCManageAccount.m

@@ -166,9 +166,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Settings/CCManageCameraUpload.m

@@ -213,9 +213,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 -(void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue

iOSClient/Settings/CCManageCryptoCloud.m

@@ -88,9 +88,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 - (void)activateCryptoCloud:(XLFormRowDescriptor *)sender

iOSClient/Settings/CCSettings.m

@@ -185,9 +185,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Transfers/CCTransfers.m

@@ -105,9 +105,7 @@
 
 - (void)changeTheming
 {
-    // Navigation & TabBar color
-    [app aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [app aspectTabBar:self.tabBarController.tabBar hidden:NO];
+    [app changeTheming:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------