From 328073209e8e828b6e537af97e5afcebd3a4dc15 Mon Sep 17 00:00:00 2001
From: giomfo <giom@matrix.org>
Date: Wed, 14 Sep 2016 16:18:16 +0200
Subject: [PATCH] Bug Fix - Chat screen: Hang up icon overlap the send button

#614
---
 Vector/Views/RoomInputToolbar/RoomInputToolbarView.m   | 8 +++++---
 Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
index d2400f9d5..3be2105c7 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
@@ -105,8 +105,8 @@
     {
         _activeCall = activeCall;
 
-        self.voiceCallButton.hidden = _activeCall;
-        self.hangupCallButton.hidden = !activeCall;
+        self.voiceCallButton.hidden = (_activeCall || !self.rightInputToolbarButton.hidden);
+        self.hangupCallButton.hidden = (!_activeCall || !self.rightInputToolbarButton.hidden);
     }
 }
 
@@ -135,6 +135,7 @@
         self.rightInputToolbarButton.hidden = NO;
         self.attachMediaButton.hidden = YES;
         self.voiceCallButton.hidden = YES;
+        self.hangupCallButton.hidden = YES;
         
         self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.rightInputToolbarButton.frame.origin.x + 4;
     }
@@ -142,7 +143,8 @@
     {
         self.rightInputToolbarButton.hidden = YES;
         self.attachMediaButton.hidden = NO;
-        self.voiceCallButton.hidden = NO;
+        self.voiceCallButton.hidden = _activeCall;
+        self.hangupCallButton.hidden = !_activeCall;
         
         self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.attachMediaButton.frame.origin.x + 4;
     }
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
index f049d2a1d..8e81f588c 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
@@ -88,7 +88,6 @@
                             <rect key="frame" x="554" y="0.0" width="46" height="46"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="2nY-YP-BvA" secondAttribute="height" multiplier="1:1" id="59L-Jf-tXO"/>
-                                <constraint firstAttribute="width" constant="46" id="p4p-x1-Puf"/>
                             </constraints>
                             <state key="normal" image="call_hangup_icon.png">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -116,6 +115,7 @@
                         <constraint firstAttribute="bottom" secondItem="2nY-YP-BvA" secondAttribute="bottom" id="asf-hj-bby"/>
                         <constraint firstAttribute="trailing" secondItem="2nY-YP-BvA" secondAttribute="trailing" id="gNM-BS-Uwc"/>
                         <constraint firstAttribute="trailing" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="95" id="hXO-cY-Jgz"/>
+                        <constraint firstItem="2nY-YP-BvA" firstAttribute="width" secondItem="Owf-M8-qJi" secondAttribute="width" id="mHj-eR-atg"/>
                         <constraint firstItem="Hga-l8-Wua" firstAttribute="top" secondItem="a84-Vc-6ud" secondAttribute="top" id="pPH-Fp-phr"/>
                         <constraint firstAttribute="trailing" secondItem="Owf-M8-qJi" secondAttribute="trailing" id="vCd-Md-dvr"/>
                         <constraint firstAttribute="bottom" secondItem="G8Z-CM-tGs" secondAttribute="bottom" id="vpk-lw-TnO"/>