mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 00:02:47 +00:00
Merge pull request #621 from vector-im/vector_614
Bug Fix - Chat screen: Hang up icon overlap the send button
This commit is contained in:
commit
2e1729705c
2 changed files with 6 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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"/>
|
||||
|
|
Loading…
Reference in a new issue