ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch

Browse Source
This commit is contained in:
Ali
2020-06-13 23:19:37 +04:00
parent e8f6fb6c05
commit 5cd75f6f4e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
View File

@@ -406,6 +406,9 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
[[_presentation view] addSubview:_outerCircleView]; [[_presentation view] addSubview:_outerCircleView];
[_outerCircleView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(outerCircleTapGesture:)]]; [_outerCircleView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(outerCircleTapGesture:)]];
} else {
_decoration.userInteractionEnabled = true;
[_decoration addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(outerCircleTapGesture:)]];
} }
_innerIconView = [[UIImageView alloc] initWithImage:_icon]; _innerIconView = [[UIImageView alloc] initWithImage:_icon];

4
submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
View File

@@ -1031,7 +1031,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
self.addSubnode(audioRecordingDotNode) self.addSubnode(audioRecordingDotNode)
} }
animateDotAppearing = transition.isAnimated animateDotAppearing = transition.isAnimated && !isLocked
audioRecordingDotNode.frame = CGRect(origin: CGPoint(x: leftInset + 2.0 - UIScreenPixel, y: panelHeight - 44 + 1), size: CGSize(width: 40.0, height: 40)) audioRecordingDotNode.frame = CGRect(origin: CGPoint(x: leftInset + 2.0 - UIScreenPixel, y: panelHeight - 44 + 1), size: CGSize(width: 40.0, height: 40))
if animateDotAppearing { if animateDotAppearing {
@@ -1085,6 +1085,8 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
let dismissDotNode = { [weak audioRecordingDotNode, weak attachmentButton, weak self] in let dismissDotNode = { [weak audioRecordingDotNode, weak attachmentButton, weak self] in
guard let audioRecordingDotNode = audioRecordingDotNode, audioRecordingDotNode === self?.audioRecordingDotNode else { return } guard let audioRecordingDotNode = audioRecordingDotNode, audioRecordingDotNode === self?.audioRecordingDotNode else { return }
self?.audioRecordingDotNode = nil
audioRecordingDotNode.layer.animateScale(from: 1.0, to: 0.3, duration: 0.15, delay: 0, removeOnCompletion: false) audioRecordingDotNode.layer.animateScale(from: 1.0, to: 0.3, duration: 0.15, delay: 0, removeOnCompletion: false)
audioRecordingDotNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, delay: 0, removeOnCompletion: false) { [weak audioRecordingDotNode] _ in audioRecordingDotNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, delay: 0, removeOnCompletion: false) { [weak audioRecordingDotNode] _ in
audioRecordingDotNode?.removeFromSupernode() audioRecordingDotNode?.removeFromSupernode()