ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-03 19:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed chat message preview layout on scrolling

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-07-30 16:52:34 +03:00
parent dabf729195
commit 7d962cc90f
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/TelegramUI/TelegramUI/ChatHistoryNavigationButtonNode.swift
View File

@@ -37,9 +37,11 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
}
private var theme: PresentationTheme
private let type: ChatHistoryNavigationButtonType
init(theme: PresentationTheme, type: ChatHistoryNavigationButtonType) {
self.theme = theme
self.type = type
self.imageNode = ASImageNode()
self.imageNode.displayWithoutProcessing = true
@@ -77,7 +79,7 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
if self.theme !== theme {
self.theme = theme
switch type {
switch self.type {
case .down:
self.imageNode.image = PresentationResourcesChat.chatHistoryNavigationButtonImage(theme)
case .mentions:

20
submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift
View File

@@ -390,14 +390,6 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
intermediateCompletion()
})
Queue.mainQueue().after(0.7) {
completedAlpha = true
completedButton = true
completedBubble = true
completedEffect = true
intermediateCompletion()
}
self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
self.contentContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { _ in })
@@ -453,6 +445,8 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
let textOffset = self.textInputNode.textView.contentSize.height - self.textInputNode.textView.contentOffset.y - self.textInputNode.textView.frame.height
self.fromMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true)
self.toMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true)
} else {
completedBubble = true
}
self.contentContainerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 160.0, y: 0.0), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true)
@@ -460,6 +454,12 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
}
}
func scrollViewDidScroll(_ scrollView: UIScrollView) {
if let layout = self.validLayout {
self.containerLayoutUpdated(layout, transition: .immediate)
}
}
func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
self.validLayout = layout
@@ -484,10 +484,13 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
let insets = layout.insets(options: [.statusBar, .input])
let inputHeight = layout.inputHeight ?? 0.0
let contentOffset = self.scrollNode.view.contentOffset.y
var contentOrigin = CGPoint(x: layout.size.width - sideInset - contentSize.width - layout.safeInsets.right, y: layout.size.height - 6.0 - insets.bottom - contentSize.height)
if inputHeight > 0.0 {
contentOrigin.y += 60.0
}
contentOrigin.y = min(contentOrigin.y + contentOffset, layout.size.height - 6.0 - layout.intrinsicInsets.bottom - contentSize.height)
transition.updateFrame(node: self.contentContainerNode, frame: CGRect(origin: contentOrigin, size: contentSize))
var nextY: CGFloat = 0.0
@@ -502,6 +505,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
if inputHeight.isZero {
sendButtonFrame.origin.y -= 60.0
}
sendButtonFrame.origin.y = min(sendButtonFrame.origin.y + contentOffset, layout.size.height - layout.intrinsicInsets.bottom - initialSendButtonFrame.height)
transition.updateFrame(node: self.sendButtonNode, frame: sendButtonFrame)
var messageFrame = self.textFieldFrame

18
submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
View File

@@ -257,15 +257,15 @@ public struct PresentationThemeAccentColor: PostboxCoding, Equatable {
}
public var color: UIColor {
let color: UIColor
if self.value < 0.5 {
color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.0, fraction: 0.5 - self.value)!
} else if self.value > 0.5 {
color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.1, fraction: self.value - 0.5)!
} else {
color = self.baseColor.color
}
return color
// let color: UIColor
// if self.value < 0.5 {
// color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.0, fraction: 0.5 - self.value)!
// } else if self.value > 0.5 {
// color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.1, fraction: self.value - 0.5)!
// } else {
// color = self.baseColor.color
// }
return self.baseColor.color
}
}