Merge branch 'ui_polishing' into 'rebranding'

Ui polishing

See merge request new-vector/element/element-ios!26

Riot/Assets/Base.lproj/Main.storyboard

@@ -38,7 +38,7 @@
                             <barButtonItem image="search_icon" id="wyR-qv-IxC" userLabel="Menu Bar Button Item">
                                 <inset key="imageInsets" minX="-5" minY="0.0" maxX="5" maxY="0.0"/>
                             </barButtonItem>
-                            <barButtonItem image="apps-icon" id="cal-D0-6Fw">
+                            <barButtonItem image="integrations_icon" id="cal-D0-6Fw">
                                 <inset key="imageInsets" minX="10" minY="0.0" maxX="-10" maxY="0.0"/>
                             </barButtonItem>
                         </rightBarButtonItems>
@@ -597,9 +597,9 @@
         <segue reference="cUw-vU-gJq"/>
     </inferredMetricsTieBreakers>
     <resources>
-        <image name="apps-icon" width="24" height="24"/>
+        <image name="integrations_icon" width="24" height="24"/>
         <image name="logo" width="120" height="101"/>
-        <image name="search_icon" width="22" height="22"/>
+        <image name="search_icon" width="24" height="24"/>
         <image name="settings_icon" width="24" height="24"/>
         <image name="tab_favourites" width="24" height="24"/>
         <image name="tab_groups" width="24" height="24"/>

Riot/Assets/Images.xcassets/Call/call_audio_mute_off_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "call_audio_mute_off_icon.png",
+      "filename" : "call_audio_mute_on_icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "call_audio_mute_off_icon@2x.png",
+      "filename" : "call_audio_mute_on_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "call_audio_mute_off_icon@3x.png",
+      "filename" : "call_audio_mute_on_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/Images.xcassets/Call/call_audio_mute_on_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "call_audio_mute_on_icon.png",
+      "filename" : "call_audio_mute_off_icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "call_audio_mute_on_icon@2x.png",
+      "filename" : "call_audio_mute_off_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "call_audio_mute_on_icon@3x.png",
+      "filename" : "call_audio_mute_off_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/Images.xcassets/Call/call_video_mute_off_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "call_video_mute_off_icon.png",
+      "filename" : "call_video_mute_on_icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "call_video_mute_off_icon@2x.png",
+      "filename" : "call_video_mute_on_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "call_video_mute_off_icon@3x.png",
+      "filename" : "call_video_mute_on_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/Images.xcassets/Call/call_video_mute_on_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "call_video_mute_on_icon.png",
+      "filename" : "call_video_mute_off_icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "call_video_mute_on_icon@2x.png",
+      "filename" : "call_video_mute_off_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "call_video_mute_on_icon@3x.png",
+      "filename" : "call_video_mute_off_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Riot/Assets/Images.xcassets/Common/admin_icon.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "admin_icon@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Communities/create_group.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "create_group.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "create_group@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "create_group@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Home/plus_floating_action.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "create_room.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "create_room@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "create_room@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Riot/Assets/Images.xcassets/People/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/People/create_direct_chat.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "create_direct_chat.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "create_direct_chat@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "create_direct_chat@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Room/apps-icon.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "apps-icon@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

Riot/Assets/Images.xcassets/Room/details_icon.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "details_icon.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "details_icon@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "details_icon@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
-}
+}

Riot/Assets/Images.xcassets/Room/integrations_icon.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "integrations_icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "integrations_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "integrations_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Riot/Assets/Images.xcassets/Room/more_reactions.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "more_reactions.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "more_reactions@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "more_reactions@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
-}
+}

Riot/Generated/Images.swift

@@ -27,9 +27,8 @@ internal enum Asset {
     internal static let callSpeakerOnIcon = ImageAsset(name: "call_speaker_on_icon")
     internal static let callVideoMuteOffIcon = ImageAsset(name: "call_video_mute_off_icon")
     internal static let callVideoMuteOnIcon = ImageAsset(name: "call_video_mute_on_icon")
+    internal static let callkitIcon = ImageAsset(name: "callkit_icon")
     internal static let cameraSwitch = ImageAsset(name: "camera_switch")
-    internal static let riotIconCallkit = ImageAsset(name: "riot_icon_callkit")
-    internal static let adminIcon = ImageAsset(name: "admin_icon")
     internal static let backIcon = ImageAsset(name: "back_icon")
     internal static let camera = ImageAsset(name: "camera")
     internal static let chevron = ImageAsset(name: "chevron")
@@ -46,7 +45,6 @@ internal enum Asset {
     internal static let smartphone = ImageAsset(name: "smartphone")
     internal static let startChat = ImageAsset(name: "start_chat")
     internal static let addGroupParticipant = ImageAsset(name: "add_group_participant")
-    internal static let createGroup = ImageAsset(name: "create_group")
     internal static let removeIconBlue = ImageAsset(name: "remove_icon_blue")
     internal static let e2eBlocked = ImageAsset(name: "e2e_blocked")
     internal static let e2eUnencrypted = ImageAsset(name: "e2e_unencrypted")
@@ -60,7 +58,7 @@ internal enum Asset {
     internal static let roomActionNotification = ImageAsset(name: "room_action_notification")
     internal static let roomActionPriorityHigh = ImageAsset(name: "room_action_priority_high")
     internal static let roomActionPriorityLow = ImageAsset(name: "room_action_priority_low")
-    internal static let createRoom = ImageAsset(name: "create_room")
+    internal static let plusFloatingAction = ImageAsset(name: "plus_floating_action")
     internal static let closeBanner = ImageAsset(name: "close_banner")
     internal static let importFilesButton = ImageAsset(name: "import_files_button")
     internal static let keyBackupLogo = ImageAsset(name: "key_backup_logo")
@@ -71,7 +69,6 @@ internal enum Asset {
     internal static let cameraStop = ImageAsset(name: "camera_stop")
     internal static let cameraVideoCapture = ImageAsset(name: "camera_video_capture")
     internal static let videoIcon = ImageAsset(name: "video_icon")
-    internal static let createDirectChat = ImageAsset(name: "create_direct_chat")
     internal static let error = ImageAsset(name: "error")
     internal static let newmessages = ImageAsset(name: "newmessages")
     internal static let scrolldown = ImageAsset(name: "scrolldown")
@@ -86,9 +83,9 @@ internal enum Asset {
     internal static let voiceCallHangupIcon = ImageAsset(name: "voice_call_hangup_icon")
     internal static let voiceCallIcon = ImageAsset(name: "voice_call_icon")
     internal static let addParticipant = ImageAsset(name: "add_participant")
-    internal static let appsIcon = ImageAsset(name: "apps-icon")
     internal static let detailsIcon = ImageAsset(name: "details_icon")
     internal static let editIcon = ImageAsset(name: "edit_icon")
+    internal static let integrationsIcon = ImageAsset(name: "integrations_icon")
     internal static let jumpToUnread = ImageAsset(name: "jump_to_unread")
     internal static let mainAliasIcon = ImageAsset(name: "main_alias_icon")
     internal static let membersListIcon = ImageAsset(name: "members_list_icon")

Riot/Managers/Theme/ThemeService.h

@@ -61,10 +61,7 @@ extern NSString *const kThemeServiceDidChangeThemeNotification;
 
 #pragma mark - Riot Colors not yet themeable
 
-@property (nonatomic, readonly) UIColor *riotColorBlue;
 @property (nonatomic, readonly) UIColor *riotColorCuriousBlue;
-@property (nonatomic, readonly) UIColor *riotColorIndigo;
-@property (nonatomic, readonly) UIColor *riotColorOrange;
 
 @end
 

Riot/Managers/Theme/ThemeService.m

@@ -103,10 +103,7 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan
     if (self)
     {
         // Riot Colors not yet themeable
-        _riotColorBlue = [[UIColor alloc] initWithRgb:0x81BDDB];
-        _riotColorCuriousBlue = [[UIColor alloc] initWithRgb:0x2A9EDB];
-        _riotColorIndigo = [[UIColor alloc] initWithRgb:0xBD79CC];
-        _riotColorOrange = [[UIColor alloc] initWithRgb:0xF8A15F];
+        _riotColorCuriousBlue = [[UIColor alloc] initWithRgb:0x2A9EDB];        
 
         if (@available(iOS 13, *))
         {

Riot/Managers/Theme/Themes/DarkTheme.swift

@@ -86,7 +86,7 @@ class DarkTheme: NSObject, Theme {
     
     // Note: We are not using UINavigationBarAppearance on iOS 13+ atm because of UINavigationBar directly include UISearchBar on their titleView that cause crop issues with UINavigationController pop.
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
-        navigationBar.tintColor = self.textSecondaryColor
+        navigationBar.tintColor = self.tintColor
         navigationBar.titleTextAttributes = [
             NSAttributedString.Key.foregroundColor: self.textPrimaryColor
         ]

Riot/Managers/Theme/Themes/DefaultTheme.swift

@@ -94,7 +94,7 @@ class DefaultTheme: NSObject, Theme {
     
     // Note: We are not using UINavigationBarAppearance on iOS 13+ atm because of UINavigationBar directly include UISearchBar on their titleView that cause crop issues with UINavigationController pop.
     func applyStyle(onNavigationBar navigationBar: UINavigationBar) {
-        navigationBar.tintColor = self.textSecondaryColor
+        navigationBar.tintColor = self.tintColor
         navigationBar.titleTextAttributes = [
             NSAttributedString.Key.foregroundColor: self.textPrimaryColor
         ]

Riot/Modules/Call/CallViewController.m

@@ -83,7 +83,7 @@
     
     UIImage *audioMuteOffButtonImage = [[UIImage imageNamed:@"call_audio_mute_off_icon"] vc_tintedImageUsingColor:unselectedColor];
     
-    UIImage *audioMuteOnButtonImage = [[UIImage imageNamed:@"call_audio_mute_on_icon"] vc_tintedImageUsingColor:selectedColor];
+    UIImage *audioMuteOnButtonImage = [[UIImage imageNamed:@"call_audio_mute_on_icon"] vc_tintedImageUsingColor:unselectedColor];
     
     [self.audioMuteButton setImage:audioMuteOffButtonImage forState:UIControlStateNormal];
     [self.audioMuteButton setImage:audioMuteOffButtonImage forState:UIControlStateHighlighted];
@@ -92,7 +92,7 @@
     // Video mute
     
     UIImage *videoOffButtonImage = [[UIImage imageNamed:@"call_video_mute_off_icon"] vc_tintedImageUsingColor:unselectedColor];
-    UIImage *videoOnButtonImage = [[UIImage imageNamed:@"call_video_mute_on_icon"] vc_tintedImageUsingColor:selectedColor];
+    UIImage *videoOnButtonImage = [[UIImage imageNamed:@"call_video_mute_on_icon"] vc_tintedImageUsingColor:unselectedColor];
     
     [self.videoMuteButton setImage:videoOffButtonImage forState:UIControlStateNormal];
     [self.videoMuteButton setImage:videoOffButtonImage forState:UIControlStateHighlighted];
@@ -101,7 +101,7 @@
     // Speaker
     
     UIImage *speakerOffButtonImage = [[UIImage imageNamed:@"call_speaker_off_icon"] vc_tintedImageUsingColor:unselectedColor];
-    UIImage *speakerOnButtonImage = [[UIImage imageNamed:@"call_speaker_on_icon"] vc_tintedImageUsingColor:selectedColor];
+    UIImage *speakerOnButtonImage = [[UIImage imageNamed:@"call_speaker_on_icon"] vc_tintedImageUsingColor:unselectedColor];
     [self.speakerButton setImage:speakerOffButtonImage forState:UIControlStateNormal];
     [self.speakerButton setImage:speakerOnButtonImage forState:UIControlStateSelected];
     

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -1597,7 +1597,7 @@
     
     plusButtonImageView.backgroundColor = [UIColor clearColor];
     plusButtonImageView.contentMode = UIViewContentModeCenter;
-    plusButtonImageView.image = [UIImage imageNamed:@"create_room"];
+    plusButtonImageView.image = [UIImage imageNamed:@"plus_floating_action"];
     plusButtonImageView.layer.shadowOpacity = 0.3;
     plusButtonImageView.layer.shadowOffset = CGSizeMake(0, 3);
     

Riot/Modules/Communities/GroupsViewController.m

@@ -206,7 +206,7 @@
     }];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_groups", @"Vector", nil);
-    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.riotColorBlue;
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -559,7 +559,7 @@
     
     plusButtonImageView.backgroundColor = [UIColor clearColor];
     plusButtonImageView.contentMode = UIViewContentModeCenter;
-    plusButtonImageView.image = [UIImage imageNamed:@"create_group"];
+    plusButtonImageView.image = [UIImage imageNamed:@"plus_floating_action"];
     plusButtonImageView.layer.shadowOpacity = 0.3;
     plusButtonImageView.layer.shadowOffset = CGSizeMake(0, 3);
     

Riot/Modules/Communities/Home/GroupHomeViewController.m

@@ -132,16 +132,16 @@
     
     [self.leftButton.layer setCornerRadius:5];
     self.leftButton.clipsToBounds = YES;
-    self.leftButton.backgroundColor = ThemeService.shared.riotColorBlue;
+    self.leftButton.backgroundColor = ThemeService.shared.theme.tintColor;
     
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
-    self.rightButton.backgroundColor = ThemeService.shared.riotColorBlue;
+    self.rightButton.backgroundColor = ThemeService.shared.theme.tintColor;
     
     if (_groupLongDescription)
     {
         _groupLongDescription.textColor = ThemeService.shared.theme.textSecondaryColor;
-        _groupLongDescription.tintColor = ThemeService.shared.riotColorBlue;
+        _groupLongDescription.tintColor = ThemeService.shared.theme.tintColor;
         
         // Update HTML loading options
         NSUInteger bgColor = [MXKTools rgbValueWithColor:ThemeService.shared.theme.headerBackgroundColor];

Riot/Modules/Communities/Members/GroupParticipantsViewController.m

@@ -1204,8 +1204,8 @@
 - (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
 {
     // bar tint color
-    searchBar.barTintColor = searchBar.tintColor = ThemeService.shared.riotColorBlue;
-    searchBar.tintColor = ThemeService.shared.riotColorBlue;
+    searchBar.barTintColor = searchBar.tintColor = ThemeService.shared.theme.tintColor;
+    searchBar.tintColor = ThemeService.shared.theme.tintColor;
     
     // FIXME: this all seems incredibly fragile and tied to gutwrenching the current UISearchBar internals.
     
@@ -1216,7 +1216,7 @@
     // Magnifying glass icon.
     UIImageView *leftImageView = (UIImageView *)searchBarTextField.leftView;
     leftImageView.image = [leftImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    leftImageView.tintColor = ThemeService.shared.riotColorBlue;
+    leftImageView.tintColor = ThemeService.shared.theme.tintColor;
     
     // remove the gray background color
     UIView *effectBackgroundTop =  [searchBarTextField valueForKey:@"_effectBackgroundTop"];
@@ -1225,10 +1225,7 @@
     effectBackgroundBottom.hidden = YES;
     
     // place holder
-    searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
-                                                                               attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
-                                                                                            NSUnderlineColorAttributeName: ThemeService.shared.riotColorBlue,
-                                                                                            NSForegroundColorAttributeName: ThemeService.shared.riotColorBlue}];
+    searchBarTextField.textColor = ThemeService.shared.theme.placeholderTextColor;
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

Riot/Modules/Communities/Rooms/GroupRoomsViewController.m

@@ -602,8 +602,8 @@
 - (void)refreshSearchBarItemsColor:(UISearchBar *)searchBar
 {
     // bar tint color
-    searchBar.barTintColor = searchBar.tintColor = ThemeService.shared.riotColorBlue;
-    searchBar.tintColor = ThemeService.shared.riotColorBlue;
+    searchBar.barTintColor = searchBar.tintColor = ThemeService.shared.theme.tintColor;
+    searchBar.tintColor = ThemeService.shared.theme.tintColor;
     
     // FIXME: this all seems incredibly fragile and tied to gutwrenching the current UISearchBar internals.
     
@@ -614,7 +614,7 @@
     // Magnifying glass icon.
     UIImageView *leftImageView = (UIImageView *)searchBarTextField.leftView;
     leftImageView.image = [leftImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-    leftImageView.tintColor = ThemeService.shared.riotColorBlue;
+    leftImageView.tintColor = ThemeService.shared.theme.tintColor;
     
     // remove the gray background color
     UIView *effectBackgroundTop =  [searchBarTextField valueForKey:@"_effectBackgroundTop"];
@@ -623,10 +623,7 @@
     effectBackgroundBottom.hidden = YES;
     
     // place holder
-    searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
-                                                                               attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
-                                                                                            NSUnderlineColorAttributeName: ThemeService.shared.riotColorBlue,
-                                                                                            NSForegroundColorAttributeName: ThemeService.shared.riotColorBlue}];
+    searchBarTextField.textColor = ThemeService.shared.theme.placeholderTextColor;
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m

@@ -72,7 +72,7 @@
     self.enableBarTintColorStatusChange = NO;
     self.rageShakeManager = [RageShakeManager sharedManager];
     
-    self.sectionHeaderTintColor = ThemeService.shared.riotColorBlue;
+    self.sectionHeaderTintColor = ThemeService.shared.theme.tintColor;
     
     // Keep visible the status bar by default.
     isStatusBarHidden = NO;

Riot/Modules/Communities/Views/GroupInviteTableViewCell.m

@@ -55,8 +55,8 @@ NSString *const kGroupInviteTableViewCellRoomKey = @"kGroupInviteTableViewCellRo
 {
     [super customizeTableViewCellRendering];
     
-    self.leftButton.backgroundColor = ThemeService.shared.riotColorBlue;
-    self.rightButton.backgroundColor = ThemeService.shared.riotColorBlue;
+    self.leftButton.backgroundColor = ThemeService.shared.theme.tintColor;
+    self.rightButton.backgroundColor = ThemeService.shared.theme.tintColor;
     
     self.noticeBadgeView.backgroundColor = ThemeService.shared.theme.noticeColor;
 }

Riot/Modules/Favorites/FavouritesViewController.m

@@ -19,6 +19,7 @@
 #import "AppDelegate.h"
 
 #import "RecentsDataSource.h"
+#import "Riot-Swift.h"
 
 @interface FavouritesViewController ()
 {    
@@ -55,7 +56,7 @@
     [super viewWillAppear:animated];
     
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_favourites", @"Vector", nil);
-    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.riotColorIndigo;
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
     
     if (recentsDataSource)
     {

Riot/Modules/People/PeopleViewController.m

@@ -29,6 +29,8 @@
 
 #import "ContactTableViewCell.h"
 
+#import "Riot-Swift.h"
+
 @interface PeopleViewController ()
 {
     NSInteger          directRoomsSectionNumber;
@@ -69,7 +71,7 @@
     [self addPlusButton];
     
     // Apply tintColor on the (+) button
-    plusButtonImageView.image = [UIImage imageNamed:@"create_direct_chat"];
+    plusButtonImageView.image = [UIImage imageNamed:@"plus_floating_action"];
     
     // Register table view cell for contacts.
     [self.recentsTableView registerClass:ContactTableViewCell.class forCellReuseIdentifier:ContactTableViewCell.defaultReuseIdentifier];
@@ -114,7 +116,7 @@
     [[MXKContactManager sharedManager] refreshLocalContacts];
 
     [AppDelegate theDelegate].masterTabBarController.navigationItem.title = NSLocalizedStringFromTable(@"title_people", @"Vector", nil);
-    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.riotColorOrange;
+    [AppDelegate theDelegate].masterTabBarController.tabBar.tintColor = ThemeService.shared.theme.tintColor;
     
     if (recentsDataSource)
     {

Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuView.swift

@@ -59,10 +59,7 @@ final class ReactionsMenuView: UIView, Themable, NibLoadable {
         super.awakeFromNib()
         
         self.reactionsBackgroundView.layer.masksToBounds = true
-        
-        let moreReactionsImage = Asset.Images.moreReactions.image.withRenderingMode(.alwaysTemplate)
-        self.moreReactionsButton.setImage(moreReactionsImage, for: .normal)
-        
+        self.moreReactionsButton.setImage(Asset.Images.moreReactions.image, for: .normal)
         self.update(theme: ThemeService.shared().theme)
     }
     
@@ -78,7 +75,7 @@ final class ReactionsMenuView: UIView, Themable, NibLoadable {
     func update(theme: Theme) {
         self.reactionsBackgroundView.backgroundColor = theme.headerBackgroundColor
         self.moreReactionsBackgroundView.backgroundColor = theme.headerBackgroundColor
-        self.moreReactionsButton.tintColor = theme.textPrimaryColor
+        self.moreReactionsButton.tintColor = theme.tintColor
     }
     
     func selectionAnimationInstructionPart1() {

Riot/Modules/Room/Members/RoomParticipantsViewController.m

@@ -1748,10 +1748,7 @@
     effectBackgroundBottom.hidden = YES;
     
     // place holder
-    searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
-                                                                               attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
-                                                                                            NSUnderlineColorAttributeName: ThemeService.shared.theme.tintColor,
-                                                                                            NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}];
+    searchBarTextField.textColor = ThemeService.shared.theme.searchPlaceholderColor;
 }
 
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText

Riot/Modules/Room/RoomViewController.m

@@ -435,6 +435,8 @@
     self.errorPresenter = [MXKErrorAlertPresentation new];
     self.roomMessageURLParser = [RoomMessageURLParser new];
     
+    self.jumpToLastUnreadLabel.text = NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil);
+    
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
@@ -470,9 +472,8 @@
     
     // Prepare jump to last unread banner
     self.jumpToLastUnreadBannerContainer.backgroundColor = ThemeService.shared.theme.backgroundColor;
-    self.jumpToLastUnreadLabel.attributedText = [[NSAttributedString alloc] initWithString:NSLocalizedStringFromTable(@"room_jump_to_first_unread", @"Vector", nil) attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle), NSUnderlineColorAttributeName: ThemeService.shared.theme.textPrimaryColor, NSForegroundColorAttributeName: ThemeService.shared.theme.textPrimaryColor}];
-    self.jumpToLastUnreadBannerSeparatorView.backgroundColor = ThemeService.shared.theme.headerBorderColor;
-    
+    self.jumpToLastUnreadLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.jumpToLastUnreadBannerSeparatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     
     self.expandedHeaderContainer.backgroundColor = ThemeService.shared.theme.baseColor;
     self.previewHeaderContainer.backgroundColor = ThemeService.shared.theme.headerBackgroundColor;
@@ -1488,7 +1489,7 @@
                 else
                 {
                     // Reset original icon
-                    self.navigationItem.rightBarButtonItems[1].image = [UIImage imageNamed:@"apps-icon"];
+                    self.navigationItem.rightBarButtonItems[1].image = [UIImage imageNamed:@"integrations_icon"];
                     self.navigationItem.rightBarButtonItems[1].accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_integrations", @"Vector", nil);
                 }
                 

Riot/Modules/Room/RoomViewController.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -47,7 +45,7 @@
                     </userDefinedRuntimeAttributes>
                 </tableView>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uK2-9a-rZj" userLabel="Expanded Header Container" customClass="ExpandedRoomTitleView">
-                    <rect key="frame" x="0.0" y="20" width="375" height="215"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="215"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <accessibility key="accessibilityConfiguration" identifier="RoomVCExpandedHeaderContainer"/>
                     <constraints>
@@ -105,7 +103,7 @@
                             </constraints>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="knN-q1-QkJ" userLabel="Separator View">
-                            <rect key="frame" x="10" y="43" width="365" height="1"/>
+                            <rect key="frame" x="0.0" y="43" width="375" height="1"/>
                             <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="1" id="8k7-fr-b8R"/>
@@ -117,7 +115,7 @@
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="7TA-9m-DJm"/>
                         <constraint firstItem="ISb-UT-u0O" firstAttribute="trailing" secondItem="S1q-B4-Df3" secondAttribute="trailing" id="ABS-rW-2Up"/>
-                        <constraint firstItem="knN-q1-QkJ" firstAttribute="leading" secondItem="S6r-bo-jxw" secondAttribute="leading" constant="10" id="DL5-gC-Y2y"/>
+                        <constraint firstItem="knN-q1-QkJ" firstAttribute="leading" secondItem="S6r-bo-jxw" secondAttribute="leading" id="DL5-gC-Y2y"/>
                         <constraint firstAttribute="bottom" secondItem="knN-q1-QkJ" secondAttribute="bottom" id="HrB-BI-pbX"/>
                         <constraint firstItem="Vlz-UJ-Jz8" firstAttribute="centerY" secondItem="S6r-bo-jxw" secondAttribute="centerY" id="Oyl-YW-LyY"/>
                         <constraint firstItem="c4g-BY-xOo" firstAttribute="centerY" secondItem="TYG-1i-OrY" secondAttribute="centerY" id="PY6-yg-tuv"/>
@@ -149,7 +147,7 @@
                     </constraints>
                 </view>
                 <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gt1-EO-UVY">
-                    <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
             </subviews>

Riot/Modules/Room/Views/Activities/RoomActivitiesView.m

@@ -103,8 +103,6 @@
     // Reset textContainer.lineFragmentPadding to remove horizontal margin.
     self.messageTextView.textContainerInset = UIEdgeInsetsZero;
     self.messageTextView.textContainer.lineFragmentPadding = 0;
-    
-    self.separatorView.hidden = YES;
 
     xibMainHeightConstraint = self.mainHeightConstraint.constant;
 }
@@ -114,7 +112,8 @@
 -(void)customizeViewRendering
 {
     [super customizeViewRendering];
-        
+    
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
     if (self.messageLabel.textColor != ThemeService.shared.theme.warningColor)
     {
         self.messageLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
@@ -273,6 +272,9 @@
     self.backgroundColor = ThemeService.shared.theme.tintColor;
     self.messageTextView.backgroundColor = ThemeService.shared.theme.tintColor;
 
+    // Hide the separator to display correctly the red pink conf call banner
+    self.separatorView.hidden = YES;
+
     [self checkHeight:YES];
 }
 
@@ -500,12 +502,17 @@
         self.messageTextView.backgroundColor = ThemeService.shared.riotColorCuriousBlue;
     }
 
+    // Hide the separator to display correctly the banner
+    self.separatorView.hidden = YES;
+
     [self checkHeight:YES];
 }
 
 - (void)reset
 {
-    self.backgroundColor = ThemeService.shared.theme.baseColor;
+    self.separatorView.hidden = NO;
+
+    self.backgroundColor = UIColor.clearColor;
 
     [self resetIcon];
     [self resetMessage];

Riot/Modules/Room/Views/InputToolbar/DisabledRoomInputToolbarView.m

@@ -39,13 +39,6 @@
     }
 }
 
-- (void)awakeFromNib
-{
-    [super awakeFromNib];
-    
-    self.separatorView.hidden = YES;
-}
-
 #pragma mark - Override MXKView
 
 -(void)customizeViewRendering
@@ -55,6 +48,8 @@
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
+
     self.disabledReasonTextView.font = [UIFont systemFontOfSize:15];
     self.disabledReasonTextView.textColor = ThemeService.shared.theme.textPrimaryColor;
     self.disabledReasonTextView.tintColor = ThemeService.shared.theme.tintColor;

Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m

@@ -69,8 +69,6 @@
     [self.rightInputToolbarButton setTitleColor:ThemeService.shared.theme.tintColor forState:UIControlStateHighlighted];
     
     self.isEncryptionEnabled = _isEncryptionEnabled;
-    
-    self.separatorView.hidden = YES;
 }
 
 #pragma mark - Override MXKView
@@ -81,6 +79,8 @@
     
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
+    
+    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
         
     // Custom the growingTextView display
     growingTextView.layer.cornerRadius = 0;

Riot/Modules/Room/Views/Title/RoomTitleView.m

@@ -74,8 +74,7 @@
 {
     [super layoutSubviews];
 
-    self.roomDetailsIconImageView.image = [MXKTools paintImage:self.roomDetailsIconImageView.image
-                                                     withColor:ThemeService.shared.theme.tintColor];
+    self.roomDetailsIconImageView.image = self.roomDetailsIconImageView.image;
     
     if (self.superview)
     {
@@ -141,6 +140,7 @@
 
     self.backgroundColor = UIColor.clearColor;
     self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? ThemeService.shared.theme.textPrimaryColor : ThemeService.shared.theme.textSecondaryColor);
+    self.roomDetailsIconImageView.tintColor = ThemeService.shared.theme.textPrimaryColor;
 }
 
 - (void)setRoomPreviewData:(RoomPreviewData *)roomPreviewData

Riot/Modules/StartChat/StartChatViewController.m

@@ -639,10 +639,7 @@
     // place holder
     if (searchBarTextField.placeholder)
     {
-        searchBarTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:searchBarTextField.placeholder
-                                                                                   attributes:@{NSUnderlineStyleAttributeName: @(NSUnderlineStyleSingle),
-                                                                                                NSUnderlineColorAttributeName: ThemeService.shared.theme.tintColor,
-                                                                                                NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}];
+        searchBarTextField.textColor = ThemeService.shared.theme.placeholderTextColor;
     }
 }