Skip to content

Commit 3ed35f9

Browse files
author
Isaac
committed
Update text field
1 parent 5ec68c7 commit 3ed35f9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

submodules/ChatMessageBackground/Sources/ChatMessageBackground.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,18 +344,20 @@ public class ChatMessageBackground: ASDisplayNode {
344344
if transition.isAnimated {
345345
self.imageView?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
346346
self.outlineImageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
347+
348+
let sourceViewFrame = sourceView.frame
347349

348350
self.view.addSubview(sourceView)
349351

350352
sourceView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak sourceView] _ in
351353
sourceView?.removeFromSuperview()
352354
})
353355

354-
if let imageView = imageView {
356+
if let imageView = self.imageView {
355357
transition.animateFrame(layer: imageView.layer, from: sourceView.frame)
356358
transition.updateFrame(layer: sourceView.layer, frame: CGRect(origin: imageView.frame.origin, size: CGSize(width: imageView.frame.width - 7.0, height: imageView.frame.height)))
357359
}
358-
transition.animateFrame(layer: self.outlineImageNode.layer, from: sourceView.frame)
360+
transition.animateFrame(layer: self.outlineImageNode.layer, from: sourceViewFrame)
359361
}
360362
}
361363
}

submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3688,8 +3688,12 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
36883688

36893689
private func updateActionButtons(hasText: Bool, transition: ContainedViewLayoutTransition) {
36903690
let alphaTransition: ContainedViewLayoutTransition = transition.isAnimated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
3691+
let blurTransitionIn: ComponentTransition = transition.isAnimated ? .easeInOut(duration: 0.18) : .immediate
3692+
let blurTransitionOut: ComponentTransition = transition.isAnimated ? .easeInOut(duration: 0.18) : .immediate
3693+
let sendButtonBlurOut: CGFloat = 4.0
36913694

36923695
var hideMicButton = false
3696+
var hideMicButtonBackground = false
36933697

36943698
var mediaInputIsActive = false
36953699
var keepSendButtonEnabled = self.keepSendButtonEnabled
@@ -3714,6 +3718,8 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
37143718
keepSendButtonEnabled = true
37153719
}
37163720
hasForward = presentationInterfaceState.interfaceState.forwardMessageIds != nil
3721+
3722+
hideMicButtonBackground = presentationInterfaceState.inputTextPanelState.mediaRecordingState != nil
37173723
}
37183724
if hasForward {
37193725
keepSendButtonEnabled = true
@@ -3733,6 +3739,8 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
37333739
}
37343740
})
37353741

3742+
blurTransitionOut.animateBlur(layer: self.sendActionButtons.sendContainerNode.layer, fromRadius: 0.0, toRadius: sendButtonBlurOut)
3743+
37363744
if let sendButtonRadialStatusNode = self.sendActionButtons.sendButtonRadialStatusNode {
37373745
alphaTransition.updateAlpha(node: sendButtonRadialStatusNode, alpha: 0.0)
37383746
}
@@ -3762,6 +3770,8 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
37623770
if (hasText || keepSendButtonEnabled && !mediaInputIsActive && !hasSlowModeButton) {
37633771
if self.sendActionButtons.sendContainerNode.alpha.isZero && self.rightSlowModeInset.isZero {
37643772
alphaTransition.updateAlpha(node: self.sendActionButtons.sendContainerNode, alpha: 1.0)
3773+
blurTransitionIn.animateBlur(layer: self.sendActionButtons.sendContainerNode.layer, fromRadius: sendButtonBlurOut, toRadius: 0.0)
3774+
transition.animatePositionAdditive(layer: self.sendActionButtons.sendButton.imageNode.layer, offset: CGPoint(x: -14.0, y: 10.0))
37653775
if let sendButtonRadialStatusNode = self.sendActionButtons.sendButtonRadialStatusNode {
37663776
alphaTransition.updateAlpha(node: sendButtonRadialStatusNode, alpha: 1.0)
37673777
}
@@ -3775,6 +3785,7 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
37753785
strongSelf.applyUpdateSendButtonIcon()
37763786
}
37773787
})
3788+
blurTransitionOut.animateBlur(layer: self.sendActionButtons.sendContainerNode.layer, fromRadius: 0.0, toRadius: sendButtonBlurOut)
37783789
if let sendButtonRadialStatusNode = self.sendActionButtons.sendButtonRadialStatusNode {
37793790
alphaTransition.updateAlpha(node: sendButtonRadialStatusNode, alpha: 0.0)
37803791
}
@@ -3812,9 +3823,14 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg
38123823
let micAlpha: CGFloat = self.mediaActionButtons.micButton.fadeDisabled ? 0.5 : 1.0
38133824
if !self.mediaActionButtons.micButton.alpha.isEqual(to: micAlpha) {
38143825
alphaTransition.updateAlpha(layer: self.mediaActionButtons.micButton.layer, alpha: micAlpha)
3815-
alphaTransition.updateAlpha(layer: self.mediaActionButtons.micButtonBackgroundView.layer, alpha: micAlpha)
38163826
alphaTransition.updateAlpha(layer: self.mediaActionButtons.micButtonTintMaskView.layer, alpha: micAlpha)
38173827
}
3828+
3829+
if hideMicButtonBackground {
3830+
alphaTransition.updateAlpha(layer: self.mediaActionButtons.micButtonBackgroundView.layer, alpha: 0.0)
3831+
} else {
3832+
alphaTransition.updateAlpha(layer: self.mediaActionButtons.micButtonBackgroundView.layer, alpha: 1.0)
3833+
}
38183834
}
38193835

38203836
if mediaInputIsActive && !hideExpandMediaInput {

0 commit comments

Comments
 (0)