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-16 01:45:47 +02:00
commit b263f37d73
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,7 +779,10 @@ 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 totalOverscrollFraction: CGFloat = max(0.0, collapsedState.maxFraction - 1.0)
let overscrollStage1 = min(0.7, totalOverscrollFraction)
let overscrollStage2 = max(0.0, totalOverscrollFraction - 0.7)
let realTimeOverscrollFraction: CGFloat = max(0.0, (1.0 - component.collapseFraction) - 1.0) let realTimeOverscrollFraction: CGFloat = max(0.0, (1.0 - component.collapseFraction) - 1.0)
var overscrollFocusIndex: Int? var overscrollFocusIndex: Int?
@ -789,7 +792,7 @@ public final class StoryPeerListComponent: Component {
break break
} }
} }
if let overscrollFocusIndex, overscrollFraction >= 0.7 { if let overscrollFocusIndex, overscrollStage2 >= 0.6 {
self.overscrollSelectedId = self.sortedItems[overscrollFocusIndex].peer.id self.overscrollSelectedId = self.sortedItems[overscrollFocusIndex].peer.id
} else { } else {
self.overscrollSelectedId = nil self.overscrollSelectedId = nil
@ -832,11 +835,11 @@ public final class StoryPeerListComponent: Component {
let overscrollScaleFactor: CGFloat let overscrollScaleFactor: CGFloat
if index == overscrollFocusIndex { if index == overscrollFocusIndex {
overscrollScaleFactor = 0.5 overscrollScaleFactor = 1.0
} else { } else {
overscrollScaleFactor = 0.1 overscrollScaleFactor = 0.0
} }
let maximizedItemScale: CGFloat = 1.0 + overscrollFraction * overscrollScaleFactor let maximizedItemScale: CGFloat = 1.0 + overscrollStage1 * 0.1 + overscrollScaleFactor * overscrollStage2 * 0.5
let minItemScale: CGFloat = minimizedItemScale.interpolate(to: minimizedMaxItemScale, amount: collapsedState.minFraction) * (1.0 - collapsedState.activityFraction) + 0.1 * collapsedState.activityFraction let minItemScale: CGFloat = minimizedItemScale.interpolate(to: minimizedMaxItemScale, amount: collapsedState.minFraction) * (1.0 - collapsedState.activityFraction) + 0.1 * collapsedState.activityFraction
@ -854,7 +857,7 @@ public final class StoryPeerListComponent: Component {
if let overscrollFocusIndex { if let overscrollFocusIndex {
let focusIndexOffset: CGFloat = max(-1.0, min(1.0, CGFloat(index - overscrollFocusIndex))) let focusIndexOffset: CGFloat = max(-1.0, min(1.0, CGFloat(index - overscrollFocusIndex)))
adjustedRegularFrame.origin.x += focusIndexOffset * overscrollFraction * 0.3 * adjustedRegularFrame.width * 0.5 adjustedRegularFrame.origin.x += focusIndexOffset * overscrollStage2 * 0.3 * adjustedRegularFrame.width * 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)