From e66ffe4cb20b0af97bff5b1e488ea0e8f842a16d Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 10 Jan 2019 15:12:24 +0100
Subject: [PATCH] reskin: Put back riot colors in the main tab bar icons

---
 Riot/Constants/RiotDesignValues.h                 | 2 ++
 Riot/Constants/RiotDesignValues.m                 | 4 ++++
 Riot/Modules/Communities/GroupsViewController.m   | 1 +
 Riot/Modules/Favorites/FavouritesViewController.m | 2 +-
 Riot/Modules/People/PeopleViewController.m        | 1 +
 Riot/Modules/Rooms/RoomsViewController.m          | 3 +++
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Riot/Constants/RiotDesignValues.h b/Riot/Constants/RiotDesignValues.h
index a04497567..ba1ded424 100644
--- a/Riot/Constants/RiotDesignValues.h
+++ b/Riot/Constants/RiotDesignValues.h
@@ -52,6 +52,8 @@ extern UIColor *kRiotColorPinkRed;
 extern UIColor *kRiotColorRed;
 extern UIColor *kRiotColorBlue;
 extern UIColor *kRiotColorCuriousBlue;
+extern UIColor *kRiotColorIndigo;
+extern UIColor *kRiotColorOrange;
 
 #pragma mark - Riot Standard Room Member Power Level
 extern NSInteger const kRiotRoomModeratorLevel;
diff --git a/Riot/Constants/RiotDesignValues.m b/Riot/Constants/RiotDesignValues.m
index 0821e6d22..af81ce331 100644
--- a/Riot/Constants/RiotDesignValues.m
+++ b/Riot/Constants/RiotDesignValues.m
@@ -42,6 +42,8 @@ UIColor *kRiotColorPinkRed;
 UIColor *kRiotColorRed;
 UIColor *kRiotColorBlue;
 UIColor *kRiotColorCuriousBlue;
+UIColor *kRiotColorIndigo;
+UIColor *kRiotColorOrange;
 
 // Riot Background Colors
 UIColor *kRiotColorLightKeyboard;   // TO REMOVE
@@ -87,6 +89,8 @@ UIScrollViewIndicatorStyle kRiotScrollBarStyle;
     kRiotColorRed = UIColorFromRGB(0xFF4444);
     kRiotColorBlue = UIColorFromRGB(0x81BDDB);
     kRiotColorCuriousBlue = UIColorFromRGB(0x2A9EDB);
+    kRiotColorIndigo = UIColorFromRGB(0xBD79CC);
+    kRiotColorOrange = UIColorFromRGB(0xF8A15F);
 
     kRiotColorLightKeyboard = UIColorFromRGB(0xE7E7E7);
     kRiotColorDarkKeyboard = UIColorFromRGB(0x7E7E7E);
diff --git a/Riot/Modules/Communities/GroupsViewController.m b/Riot/Modules/Communities/GroupsViewController.m
index a247da74f..ff71514bb 100644
--- a/Riot/Modules/Communities/GroupsViewController.m
+++ b/Riot/Modules/Communities/GroupsViewController.m
@@ -204,6 +204,7 @@
     }];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_groups", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = kRiotColorBlue;
 }
 
 - (void)viewWillDisappear:(BOOL)animated
diff --git a/Riot/Modules/Favorites/FavouritesViewController.m b/Riot/Modules/Favorites/FavouritesViewController.m
index 5edd70483..a45af8da0 100644
--- a/Riot/Modules/Favorites/FavouritesViewController.m
+++ b/Riot/Modules/Favorites/FavouritesViewController.m
@@ -55,6 +55,7 @@
     [super viewWillAppear:animated];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_favourites", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = kRiotColorIndigo;
     
     if (recentsDataSource)
     {
@@ -64,7 +65,6 @@
     }
 }
 
-
 - (void)dealloc
 {
     
diff --git a/Riot/Modules/People/PeopleViewController.m b/Riot/Modules/People/PeopleViewController.m
index f6f3a09d9..914fc6744 100644
--- a/Riot/Modules/People/PeopleViewController.m
+++ b/Riot/Modules/People/PeopleViewController.m
@@ -108,6 +108,7 @@
     }
 
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_people", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = kRiotColorOrange;
     
     if (recentsDataSource)
     {
diff --git a/Riot/Modules/Rooms/RoomsViewController.m b/Riot/Modules/Rooms/RoomsViewController.m
index 64b6c121f..5d01c3115 100644
--- a/Riot/Modules/Rooms/RoomsViewController.m
+++ b/Riot/Modules/Rooms/RoomsViewController.m
@@ -22,6 +22,8 @@
 
 #import "DirectoryServerPickerViewController.h"
 
+#import "Riot-Swift.h"
+
 @interface RoomsViewController ()
 {
     RecentsDataSource *recentsDataSource;
@@ -62,6 +64,7 @@
     [super viewWillAppear:animated];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_rooms", @"Vector", nil);
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = RiotDesignValues.colorValues.accent;
     
     if ([self.dataSource isKindOfClass:RecentsDataSource.class])
     {