ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-07-15 21:19:53 +02:00
commit 180a969854
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift
View File

@ -771,6 +771,7 @@ public final class StoryPeerListComponent: Component {
let expandedItemWidth: CGFloat = 60.0 let expandedItemWidth: CGFloat = 60.0
let overscrollFraction: CGFloat = max(0.0, collapsedState.maxFraction - 1.0) let overscrollFraction: CGFloat = max(0.0, collapsedState.maxFraction - 1.0)
let realTimeOverscrollFraction: CGFloat = max(0.0, (1.0 - component.collapseFraction) - 1.0)
struct MeasuredItem { struct MeasuredItem {
var itemFrame: CGRect var itemFrame: CGRect
@ -822,11 +823,12 @@ public final class StoryPeerListComponent: Component {
adjustedRegularFrame = adjustedRegularFrame.interpolate(to: itemLayout.frame(at: effectiveFirstVisibleIndex + collapseEndIndex), amount: 0.0) adjustedRegularFrame = adjustedRegularFrame.interpolate(to: itemLayout.frame(at: effectiveFirstVisibleIndex + collapseEndIndex), amount: 0.0)
} }
adjustedRegularFrame.origin.x -= effectiveVisibleBounds.minX adjustedRegularFrame.origin.x -= effectiveVisibleBounds.minX
adjustedRegularFrame.origin.y += overscrollFraction * 83.0 * 0.5
let collapsedItemPosition: CGPoint = collapsedItemFrame.center.interpolate(to: collapsedMaxItemFrame.center, amount: collapsedState.minFraction) let collapsedItemPosition: CGPoint = collapsedItemFrame.center.interpolate(to: collapsedMaxItemFrame.center, amount: collapsedState.minFraction)
let itemPosition = collapsedItemPosition.interpolate(to: adjustedRegularFrame.center, amount: min(1.0, collapsedState.maxFraction)) var itemPosition = collapsedItemPosition.interpolate(to: adjustedRegularFrame.center, amount: min(1.0, collapsedState.maxFraction))
itemPosition.y += realTimeOverscrollFraction * 83.0 * 0.5
let _ = expandBoundsFraction let _ = expandBoundsFraction
/*var bounceOffsetFraction = (adjustedRegularFrame.midX - itemLayout.frame(at: collapseStartIndex).midX) / itemLayout.containerSize.width /*var bounceOffsetFraction = (adjustedRegularFrame.midX - itemLayout.frame(at: collapseStartIndex).midX) / itemLayout.containerSize.width

2
submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
View File

@ -724,7 +724,7 @@ final class ChatMessageAvatarHeaderNode: ListViewItemHeaderNode {
if let channel = peer as? TelegramChannel, case .broadcast = channel.info { if let channel = peer as? TelegramChannel, case .broadcast = channel.info {
self.controllerInteraction.openPeer(EnginePeer(peer), .chat(textInputState: nil, subject: nil, peekData: nil), self.messageReference, .default) self.controllerInteraction.openPeer(EnginePeer(peer), .chat(textInputState: nil, subject: nil, peekData: nil), self.messageReference, .default)
} else { } else {
self.controllerInteraction.openPeer(EnginePeer(peer), .info, self.messageReference, .groupParticipant(storyStats: self.storyStats, avatarHeaderNode: self)) self.controllerInteraction.openPeer(EnginePeer(peer), .info, self.messageReference, .groupParticipant(storyStats: nil, avatarHeaderNode: self))
} }
} }
} }