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

Experimental overscroll

Browse Source
This commit is contained in:
Ali 2023-07-15 22:25:29 +04:00
parent f8a7d0e2e6
commit f56859e2e2
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListNavigationBar.swift
View File

@ -322,7 +322,7 @@ public final class ChatListNavigationBar: Component {
let storiesOffsetFraction: CGFloat
let storiesUnlocked: Bool
if allowAvatarsExpansion {
storiesOffsetFraction = max(0.0, min(1.0, -offset / ChatListNavigationBar.storiesScrollHeight))
storiesOffsetFraction = max(0.0, min(4.0, -offset / ChatListNavigationBar.storiesScrollHeight))
if offset <= -60.0 {
storiesUnlocked = true

2
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
View File

@ -3913,7 +3913,7 @@ public final class StoryItemSetContainerComponent: Component {
let _ = component.context.engine.peers.updatePeerStoriesHidden(id: component.slice.peer.id, isHidden: !isHidden)
let text = isHidden ? "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Archived Chats." : "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Chats."
let text = !isHidden ? "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Archived Chats." : "Stories from **\(component.slice.peer.compactDisplayTitle)** will now be shown in Chats."
let tooltipScreen = TooltipScreen(
context: component.context,
account: component.context.account,

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

@ -617,9 +617,10 @@ public final class StoryPeerListComponent: Component {
var activityFraction: CGFloat
}
let targetExpandedFraction = component.collapseFraction
let mappedTargetFraction: CGFloat = component.collapseFraction
let targetFraction: CGFloat = component.collapseFraction
let targetExpandedFraction: CGFloat = mappedTargetFraction
let targetFraction: CGFloat = mappedTargetFraction
let targetScaleFraction: CGFloat
let targetMinFraction: CGFloat
@ -704,7 +705,7 @@ public final class StoryPeerListComponent: Component {
}
} else {
collapsedState = CollapseState(
globalFraction: component.collapseFraction,
globalFraction: targetFraction,
scaleFraction: targetScaleFraction,
minFraction: targetMinFraction,
maxFraction: targetMaxFraction,
@ -769,6 +770,8 @@ public final class StoryPeerListComponent: Component {
let expandedItemWidth: CGFloat = 60.0
let overscrollFraction: CGFloat = max(0.0, collapsedState.maxFraction - 1.0)
struct MeasuredItem {
var itemFrame: CGRect
var itemScale: CGFloat
@ -804,11 +807,11 @@ public final class StoryPeerListComponent: Component {
let minimizedMaxItemScale: CGFloat = (24.0 + 4.0) / 52.0
let maximizedItemScale: CGFloat = 1.0
let maximizedItemScale: CGFloat = 1.0 + overscrollFraction * 0.1
let minItemScale: CGFloat = minimizedItemScale.interpolate(to: minimizedMaxItemScale, amount: collapsedState.minFraction) * (1.0 - collapsedState.activityFraction) + 0.1 * collapsedState.activityFraction
let itemScale: CGFloat = minItemScale.interpolate(to: maximizedItemScale, amount: collapsedState.maxFraction)
let itemScale: CGFloat = minItemScale.interpolate(to: maximizedItemScale, amount: min(1.0, collapsedState.maxFraction))
let itemFrame: CGRect
if isReallyVisible {
@ -819,14 +822,16 @@ 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)
var itemPosition = collapsedItemPosition.interpolate(to: adjustedRegularFrame.center, amount: collapsedState.maxFraction)
let itemPosition = collapsedItemPosition.interpolate(to: adjustedRegularFrame.center, amount: min(1.0, collapsedState.maxFraction))
var bounceOffsetFraction = (adjustedRegularFrame.midX - itemLayout.frame(at: collapseStartIndex).midX) / itemLayout.containerSize.width
let _ = expandBoundsFraction
/*var bounceOffsetFraction = (adjustedRegularFrame.midX - itemLayout.frame(at: collapseStartIndex).midX) / itemLayout.containerSize.width
bounceOffsetFraction = max(-1.0, min(1.0, bounceOffsetFraction))
itemPosition.x += min(10.0, expandBoundsFraction * collapsedState.maxFraction * 1200.0) * bounceOffsetFraction
itemPosition.x += min(10.0, expandBoundsFraction * min(1.0, collapsedState.maxFraction) * 1200.0) * bounceOffsetFraction*/
let itemSize = CGSize(width: adjustedRegularFrame.width * itemScale, height: adjustedRegularFrame.height)
@ -902,7 +907,7 @@ public final class StoryPeerListComponent: Component {
var isCollapsable: Bool = false
var itemScale = measuredItem.itemScale
if itemLayout.itemCount == 1 {
let singleScaleFactor = min(1.0, collapsedState.minFraction + collapsedState.maxFraction)
let singleScaleFactor = min(1.0, collapsedState.minFraction + min(1.0, collapsedState.maxFraction))
itemScale = 0.001 * (1.0 - singleScaleFactor) + itemScale * singleScaleFactor
}
@ -920,7 +925,7 @@ public final class StoryPeerListComponent: Component {
itemAlpha = (collapsedState.sideAlphaFraction * 1.0 + (1.0 - collapsedState.sideAlphaFraction) * (1.0 - collapsedState.activityFraction)) * collapsedState.sideAlphaFraction
} else {
if itemLayout.itemCount == 1 {
itemAlpha = min(1.0, (collapsedState.minFraction + collapsedState.maxFraction) * 4.0)
itemAlpha = min(1.0, (collapsedState.minFraction + min(1.0, collapsedState.maxFraction)) * 4.0)
} else {
itemAlpha = collapsedState.sideAlphaFraction
}
@ -1165,7 +1170,7 @@ public final class StoryPeerListComponent: Component {
if self.sortedItems.isEmpty {
titleContentOffset = collapsedTitleOffset
} else {
titleContentOffset = titleMinContentOffset.interpolate(to: ((itemLayout.containerSize.width - collapsedState.titleWidth) * 0.5) as CGFloat, amount: collapsedState.maxFraction * (1.0 - collapsedState.activityFraction))
titleContentOffset = titleMinContentOffset.interpolate(to: ((itemLayout.containerSize.width - collapsedState.titleWidth) * 0.5) as CGFloat, amount: min(1.0, collapsedState.maxFraction) * (1.0 - collapsedState.activityFraction))
}
var titleIndicatorSize: CGSize?