Merge branch 'remove_input_bars_separators' into 'rebranding'

Remove input bars separators

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

Riot/Modules/Room/ContextualMenu/RoomContextualMenuToolbarView.swift

@@ -44,7 +44,6 @@ final class RoomContextualMenuToolbarView: MXKRoomInputToolbarView, NibOwnerLoad
         self.theme = theme
         self.backgroundColor = theme.backgroundColor
         self.tintColor = theme.tintColor
-        self.separatorView.backgroundColor = theme.lineBreakColor
         
         for menuItemView in self.menuItemViews {
             menuItemView.titleColor = theme.tintColor
@@ -74,6 +73,7 @@ final class RoomContextualMenuToolbarView: MXKRoomInputToolbarView, NibOwnerLoad
     // MARK: - Setup
     
     private func commonInit() {
+        self.separatorView.isHidden = true
     }
     
     convenience init() {

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

@@ -103,6 +103,8 @@
     // Reset textContainer.lineFragmentPadding to remove horizontal margin.
     self.messageTextView.textContainerInset = UIEdgeInsetsZero;
     self.messageTextView.textContainer.lineFragmentPadding = 0;
+    
+    self.separatorView.hidden = YES;
 
     xibMainHeightConstraint = self.mainHeightConstraint.constant;
 }
@@ -112,8 +114,7 @@
 -(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;
@@ -272,9 +273,6 @@
     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];
 }
 
@@ -502,17 +500,12 @@
         self.messageTextView.backgroundColor = ThemeService.shared.riotColorCuriousBlue;
     }
 
-    // Hide the separator to display correctly the banner
-    self.separatorView.hidden = YES;
-
     [self checkHeight:YES];
 }
 
 - (void)reset
 {
-    self.separatorView.hidden = NO;
-
-    self.backgroundColor = UIColor.clearColor;
+    self.backgroundColor = ThemeService.shared.theme.baseColor;
 
     [self resetIcon];
     [self resetMessage];

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

@@ -39,6 +39,13 @@
     }
 }
 
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.separatorView.hidden = YES;
+}
+
 #pragma mark - Override MXKView
 
 -(void)customizeViewRendering
@@ -48,8 +55,6 @@
     // 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,6 +69,8 @@
     [self.rightInputToolbarButton setTitleColor:ThemeService.shared.theme.tintColor forState:UIControlStateHighlighted];
     
     self.isEncryptionEnabled = _isEncryptionEnabled;
+    
+    self.separatorView.hidden = YES;
 }
 
 #pragma mark - Override MXKView
@@ -79,9 +81,7 @@
     
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
-    
-    self.separatorView.backgroundColor = ThemeService.shared.theme.lineBreakColor;
-    
+        
     // Custom the growingTextView display
     growingTextView.layer.cornerRadius = 0;
     growingTextView.layer.borderWidth = 0;