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

[WIP] Stories

Browse Source
This commit is contained in:
Ali 2023-05-19 18:55:40 +04:00
parent efdfffeae3
commit df1e959bb1
7 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
submodules/ChatListUI/Sources/ChatListController.swift
View File

@ -2493,6 +2493,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
destinationView: transitionView, destinationView: transitionView,
destinationRect: transitionView.bounds, destinationRect: transitionView.bounds,
destinationCornerRadius: transitionView.bounds.height * 0.5, destinationCornerRadius: transitionView.bounds.height * 0.5,
destinationIsAvatar: true,
completed: {} completed: {}
) )
} }

12
submodules/TelegramCore/Sources/TelegramEngine/Messages/StoryListContext.swift
View File

@ -257,7 +257,7 @@ public final class StoryListContext {
if lhsItem.timestamp != rhsItem.timestamp { if lhsItem.timestamp != rhsItem.timestamp {
switch scope { switch scope {
case .all: case .all:
return lhsItem.timestamp > rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
case .peer: case .peer:
return lhsItem.timestamp < rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
} }
@ -309,7 +309,7 @@ public final class StoryListContext {
} }
itemSets.sort(by: { lhs, rhs in itemSets.sort(by: { lhs, rhs in
guard let lhsItem = lhs.items.first, let rhsItem = rhs.items.first else { guard let lhsItem = lhs.items.last, let rhsItem = rhs.items.last else {
if lhs.items.first != nil { if lhs.items.first != nil {
return false return false
} else { } else {
@ -553,7 +553,7 @@ public final class StoryListContext {
if lhsItem.timestamp != rhsItem.timestamp { if lhsItem.timestamp != rhsItem.timestamp {
switch scope { switch scope {
case .all: case .all:
return lhsItem.timestamp > rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
case .peer: case .peer:
return lhsItem.timestamp < rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
} }
@ -573,7 +573,7 @@ public final class StoryListContext {
if lhsItem.timestamp != rhsItem.timestamp { if lhsItem.timestamp != rhsItem.timestamp {
switch scope { switch scope {
case .all: case .all:
return lhsItem.timestamp > rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
case .peer: case .peer:
return lhsItem.timestamp < rhsItem.timestamp return lhsItem.timestamp < rhsItem.timestamp
} }
@ -585,8 +585,8 @@ public final class StoryListContext {
} }
itemSets.sort(by: { lhs, rhs in itemSets.sort(by: { lhs, rhs in
guard let lhsItem = lhs.items.first, let rhsItem = rhs.items.first else { guard let lhsItem = lhs.items.last, let rhsItem = rhs.items.last else {
if lhs.items.first != nil { if lhs.items.last != nil {
return false return false
} else { } else {
return true return true

6
submodules/TelegramUI/Components/MessageInputPanelComponent/Sources/MessageInputPanelComponent.swift
View File

@ -707,8 +707,7 @@ public final class MessageInputPanelComponent: Component {
self.mediaRecordingVibrancyContainer.addSubview(mediaRecordingPanelView.vibrancyContainer) self.mediaRecordingVibrancyContainer.addSubview(mediaRecordingPanelView.vibrancyContainer)
} }
mediaRecordingPanelTransition.setFrame(view: mediaRecordingPanelView, frame: CGRect(origin: CGPoint(), size: size)) mediaRecordingPanelTransition.setFrame(view: mediaRecordingPanelView, frame: CGRect(origin: CGPoint(), size: size))
mediaRecordingPanelTransition.setFrame(view: self.mediaRecordingVibrancyContainer, frame: CGRect(origin: CGPoint(x: -fieldBackgroundFrame.minX, y: -fieldBackgroundFrame.minY), size: size))
transition.setFrame(view: self.mediaRecordingVibrancyContainer, frame: CGRect(origin: CGPoint(x: -fieldBackgroundFrame.minX, y: -fieldBackgroundFrame.minY), size: size))
if animateIn && !transition.animation.isImmediate { if animateIn && !transition.animation.isImmediate {
mediaRecordingPanelView.animateIn() mediaRecordingPanelView.animateIn()
@ -787,8 +786,7 @@ public final class MessageInputPanelComponent: Component {
self.mediaRecordingVibrancyContainer.addSubview(mediaPreviewPanelView.vibrancyContainer) self.mediaRecordingVibrancyContainer.addSubview(mediaPreviewPanelView.vibrancyContainer)
} }
mediaPreviewPanelTransition.setFrame(view: mediaPreviewPanelView, frame: CGRect(origin: CGPoint(), size: size)) mediaPreviewPanelTransition.setFrame(view: mediaPreviewPanelView, frame: CGRect(origin: CGPoint(), size: size))
mediaPreviewPanelTransition.setFrame(view: self.mediaRecordingVibrancyContainer, frame: CGRect(origin: CGPoint(x: -fieldBackgroundFrame.minX, y: -fieldBackgroundFrame.minY), size: size))
transition.setFrame(view: self.mediaRecordingVibrancyContainer, frame: CGRect(origin: CGPoint(x: -fieldBackgroundFrame.minX, y: -fieldBackgroundFrame.minY), size: size))
if animateIn && !transition.animation.isImmediate { if animateIn && !transition.animation.isImmediate {
mediaPreviewPanelView.animateIn() mediaPreviewPanelView.animateIn()

1
submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoStoryPaneNode.swift
View File

@ -947,6 +947,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScr
destinationView: self.view, destinationView: self.view,
destinationRect: self.itemGrid.view.convert(itemRect, to: self.view), destinationRect: self.itemGrid.view.convert(itemRect, to: self.view),
destinationCornerRadius: 0.0, destinationCornerRadius: 0.0,
destinationIsAvatar: false,
completed: {} completed: {}
) )
} }

3
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryContainerScreen.swift
View File

@ -756,17 +756,20 @@ public class StoryContainerScreen: ViewControllerComponentContainer {
public weak var destinationView: UIView? public weak var destinationView: UIView?
public let destinationRect: CGRect public let destinationRect: CGRect
public let destinationCornerRadius: CGFloat public let destinationCornerRadius: CGFloat
public let destinationIsAvatar: Bool
public let completed: () -> Void public let completed: () -> Void
public init( public init(
destinationView: UIView, destinationView: UIView,
destinationRect: CGRect, destinationRect: CGRect,
destinationCornerRadius: CGFloat, destinationCornerRadius: CGFloat,
destinationIsAvatar: Bool,
completed: @escaping () -> Void completed: @escaping () -> Void
) { ) {
self.destinationView = destinationView self.destinationView = destinationView
self.destinationRect = destinationRect self.destinationRect = destinationRect
self.destinationCornerRadius = destinationCornerRadius self.destinationCornerRadius = destinationCornerRadius
self.destinationIsAvatar = destinationIsAvatar
self.completed = completed self.completed = completed
} }
} }

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

@ -568,10 +568,12 @@ public final class StoryItemSetContainerComponent: Component {
let innerSourceLocalFrame = CGRect(origin: CGPoint(x: sourceLocalFrame.minX - self.contentContainerView.frame.minX, y: sourceLocalFrame.minY - self.contentContainerView.frame.minY), size: sourceLocalFrame.size) let innerSourceLocalFrame = CGRect(origin: CGPoint(x: sourceLocalFrame.minX - self.contentContainerView.frame.minX, y: sourceLocalFrame.minY - self.contentContainerView.frame.minY), size: sourceLocalFrame.size)
if let rightInfoView = self.rightInfoItem?.view.view { if let rightInfoView = self.rightInfoItem?.view.view {
let positionKeyframes: [CGPoint] = generateParabollicMotionKeyframes(from: CGPoint(x: innerSourceLocalFrame.center.x - rightInfoView.layer.position.x, y: innerSourceLocalFrame.center.y - rightInfoView.layer.position.y), to: CGPoint(), elevation: 0.0, duration: 0.3, curve: .spring, reverse: false) if transitionIn.sourceCornerRadius != 0.0 {
rightInfoView.layer.animateKeyframes(values: positionKeyframes.map { NSValue(cgPoint: $0) }, duration: 0.3, keyPath: "position", additive: true) let positionKeyframes: [CGPoint] = generateParabollicMotionKeyframes(from: CGPoint(x: innerSourceLocalFrame.center.x - rightInfoView.layer.position.x, y: innerSourceLocalFrame.center.y - rightInfoView.layer.position.y), to: CGPoint(), elevation: 0.0, duration: 0.3, curve: .spring, reverse: false)
rightInfoView.layer.animateKeyframes(values: positionKeyframes.map { NSValue(cgPoint: $0) }, duration: 0.3, keyPath: "position", additive: true)
rightInfoView.layer.animateScale(from: innerSourceLocalFrame.width / rightInfoView.bounds.width, to: 1.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
rightInfoView.layer.animateScale(from: innerSourceLocalFrame.width / rightInfoView.bounds.width, to: 1.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
}
} }
self.contentContainerView.layer.animatePosition(from: sourceLocalFrame.center, to: self.contentContainerView.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) self.contentContainerView.layer.animatePosition(from: sourceLocalFrame.center, to: self.contentContainerView.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
@ -635,11 +637,13 @@ public final class StoryItemSetContainerComponent: Component {
let innerSourceLocalFrame = CGRect(origin: CGPoint(x: sourceLocalFrame.minX - self.contentContainerView.frame.minX, y: sourceLocalFrame.minY - self.contentContainerView.frame.minY), size: sourceLocalFrame.size) let innerSourceLocalFrame = CGRect(origin: CGPoint(x: sourceLocalFrame.minX - self.contentContainerView.frame.minX, y: sourceLocalFrame.minY - self.contentContainerView.frame.minY), size: sourceLocalFrame.size)
if let rightInfoView = self.rightInfoItem?.view.view { if let rightInfoView = self.rightInfoItem?.view.view {
let positionKeyframes: [CGPoint] = generateParabollicMotionKeyframes(from: innerSourceLocalFrame.center, to: rightInfoView.layer.position, elevation: 0.0, duration: 0.3, curve: .spring, reverse: true) if transitionOut.destinationIsAvatar {
rightInfoView.layer.position = positionKeyframes[positionKeyframes.count - 1] let positionKeyframes: [CGPoint] = generateParabollicMotionKeyframes(from: innerSourceLocalFrame.center, to: rightInfoView.layer.position, elevation: 0.0, duration: 0.3, curve: .spring, reverse: true)
rightInfoView.layer.animateKeyframes(values: positionKeyframes.map { NSValue(cgPoint: $0) }, duration: 0.3, keyPath: "position", removeOnCompletion: false, additive: false) rightInfoView.layer.position = positionKeyframes[positionKeyframes.count - 1]
rightInfoView.layer.animateKeyframes(values: positionKeyframes.map { NSValue(cgPoint: $0) }, duration: 0.3, keyPath: "position", removeOnCompletion: false, additive: false)
rightInfoView.layer.animateScale(from: 1.0, to: innerSourceLocalFrame.width / rightInfoView.bounds.width, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)
rightInfoView.layer.animateScale(from: 1.0, to: innerSourceLocalFrame.width / rightInfoView.bounds.width, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)
}
} }
self.contentContainerView.layer.animatePosition(from: self.contentContainerView.center, to: sourceLocalFrame.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false) self.contentContainerView.layer.animatePosition(from: self.contentContainerView.center, to: sourceLocalFrame.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)

16
submodules/TelegramUI/Sources/TelegramRootController.swift
View File

@ -363,13 +363,15 @@ public final class TelegramRootController: NavigationController, TelegramRootCon
var randomId: Int64 = 0 var randomId: Int64 = 0
arc4random_buf(&randomId, 8) arc4random_buf(&randomId, 8)
let scaledSize = image.size.aspectFittedOrSmaller(CGSize(width: 1920, height: 1920)) let scaledSize = image.size.aspectFittedOrSmaller(CGSize(width: 1920, height: 1920))
if let scaledImage = scaleImageToPixelSize(image: image, size: scaledSize) { var scaledImage: UIImage? = image
if let scaledImageData = compressImageToJPEG(scaledImage, quality: 0.6) { if image.size.width > scaledSize.width || image.size.height > scaledSize.height {
storyListContext.upload(media: .image(dimensions: dimensions, data: scaledImageData), text: caption?.string ?? "", entities: [], privacy: privacy) scaledImage = scaleImageToPixelSize(image: image, size: scaledSize)
Queue.mainQueue().after(0.2, { [weak chatListController] in }
chatListController?.animateStoryUploadRipple() if let scaledImage, let scaledImageData = compressImageToJPEG(scaledImage, quality: 0.6) {
}) storyListContext.upload(media: .image(dimensions: dimensions, data: scaledImageData), text: caption?.string ?? "", entities: [], privacy: privacy)
} Queue.mainQueue().after(0.2, { [weak chatListController] in
chatListController?.animateStoryUploadRipple()
})
} }
case let .video(content, _, values, duration, dimensions, caption): case let .video(content, _, values, duration, dimensions, caption):
let adjustments: VideoMediaResourceAdjustments let adjustments: VideoMediaResourceAdjustments