From cdd7e40b91574d0fae04b8cc7a273109d1f51d37 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Sat, 15 Jul 2023 22:43:58 +0400 Subject: [PATCH 1/2] Adjust overscroll --- .../Sources/StoryPeerListComponent.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift b/submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift index 531a944d97..2245374a72 100644 --- a/submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift +++ b/submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift @@ -771,6 +771,7 @@ public final class StoryPeerListComponent: Component { let expandedItemWidth: CGFloat = 60.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 { 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.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 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 /*var bounceOffsetFraction = (adjustedRegularFrame.midX - itemLayout.frame(at: collapseStartIndex).midX) / itemLayout.containerSize.width From baf317921e9afbe97ffb30506c8d52ffacf94464 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Sat, 15 Jul 2023 22:47:08 +0400 Subject: [PATCH 2/2] Ignore stories in chat messages for now --- submodules/TelegramUI/Sources/ChatMessageDateHeader.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift index 91490333d2..9e6e0ed637 100644 --- a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift +++ b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift @@ -724,7 +724,7 @@ final class ChatMessageAvatarHeaderNode: ListViewItemHeaderNode { 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) } 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)) } } }