ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 11:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-09-05 19:39:43 +04:00
commit 81c5ce4af9
14 changed files with 266 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/NotificationService/Sources/NotificationService.swift
View File

@ -785,10 +785,6 @@ private final class NotificationServiceHandler {
var recordId: AccountRecordId?
var isCurrentAccount: Bool = false
let loggingSettings = sharedData.entries[SharedDataKeys.loggingSettings]?.get(LoggingSettings.self) ?? LoggingSettings.defaultSettings
Logger.shared.logToFile = loggingSettings.logToFile
Logger.shared.logToConsole = loggingSettings.logToConsole
var automaticMediaDownloadSettings: MediaAutoDownloadSettings
if let value = sharedData.entries[ApplicationSpecificSharedDataKeys.automaticMediaDownloadSettings]?.get(MediaAutoDownloadSettings.self) {
automaticMediaDownloadSettings = value

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

@ -2851,50 +2851,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
})
})))
let isMuted = resolvedAreStoriesMuted(globalSettings: globalSettings._asGlobalNotificationSettings(), peer: peer._asPeer(), peerSettings: notificationSettings._asNotificationSettings(), topSearchPeers: topSearchPeers)
items.append(.action(ContextMenuActionItem(text: isMuted ? self.presentationData.strings.StoryFeed_ContextNotifyOn : self.presentationData.strings.StoryFeed_ContextNotifyOff, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: isMuted ? "Chat/Context Menu/Unmute" : "Chat/Context Menu/Muted"), color: theme.contextMenu.primaryColor)
}, action: { [weak self] _, f in
f(.default)
guard let self else {
return
}
let _ = self.context.engine.peers.togglePeerStoriesMuted(peerId: peer.id).start()
let iconColor = UIColor.white
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
if isMuted {
self.present(UndoOverlayController(
presentationData: presentationData,
content: .universal(animation: "anim_profileunmute", scale: 0.075, colors: [
"Middle.Group 1.Fill 1": iconColor,
"Top.Group 1.Fill 1": iconColor,
"Bottom.Group 1.Fill 1": iconColor,
"EXAMPLE.Group 1.Fill 1": iconColor,
"Line.Group 1.Stroke 1": iconColor
], title: nil, text: presentationData.strings.StoryFeed_TooltipNotifyOn(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).string, customUndoText: nil, timeout: nil),
elevatedLayout: false,
animateInAsReplacement: false,
action: { _ in return false }
), in: .current)
} else {
self.present(UndoOverlayController(
presentationData: presentationData,
content: .universal(animation: "anim_profilemute", scale: 0.075, colors: [
"Middle.Group 1.Fill 1": iconColor,
"Top.Group 1.Fill 1": iconColor,
"Bottom.Group 1.Fill 1": iconColor,
"EXAMPLE.Group 1.Fill 1": iconColor,
"Line.Group 1.Stroke 1": iconColor
], title: nil, text: presentationData.strings.StoryFeed_TooltipNotifyOff(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).string, customUndoText: nil, timeout: nil),
elevatedLayout: false,
animateInAsReplacement: false,
action: { _ in return false }
), in: .current)
}
})))
let hideText: String
if self.location == .chatList(groupId: .archive) {
hideText = self.presentationData.strings.StoryFeed_ContextUnarchive

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

@ -545,6 +545,12 @@ public final class InlineStickerItemLayer: MultiAnimationRenderTarget {
public final class EmojiTextAttachmentView: UIView {
private let contentLayer: InlineStickerItemLayer
public var isActive: Bool = true {
didSet {
}
}
public convenience init(context: AccountContext, userLocation: MediaResourceUserLocation, emoji: ChatTextInputTextCustomEmojiAttribute, file: TelegramMediaFile?, cache: AnimationCache, renderer: MultiAnimationRenderer, placeholderColor: UIColor, pointSize: CGSize) {
self.init(
context: .account(context),

28
submodules/TelegramUI/Components/LottieComponent/Sources/LottieComponent.swift
View File

@ -146,6 +146,26 @@ public final class LottieComponent: Component {
private var currentTemplateFrameImage: UIImage?
public var externalShouldPlay: Bool? {
didSet {
if self.externalShouldPlay != oldValue {
self.visibilityUpdated()
}
}
}
var isEffectivelyVisible: Bool {
if !self.isVisible {
return false
}
if let externalShouldPlay = self.externalShouldPlay {
if !externalShouldPlay {
return false
}
}
return true
}
public weak var output: UIImageView? {
didSet {
if let output = self.output, let currentTemplateFrameImage = self.currentTemplateFrameImage {
@ -190,10 +210,14 @@ public final class LottieComponent: Component {
}
private func visibilityUpdated() {
if self.isVisible {
if self.isEffectivelyVisible {
if self.scheduledPlayOnce {
self.playOnce()
} else {
self.displayLink?.isPaused = false
}
} else {
self.displayLink?.isPaused = true
}
}
@ -204,7 +228,7 @@ public final class LottieComponent: Component {
self.scheduledPlayOnce = true
return
}
if !self.isVisible {
if !self.isEffectivelyVisible {
self.scheduledPlayOnce = true
return
}

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

@ -431,6 +431,7 @@ public final class MessageInputPanelComponent: Component {
let blurEffect = UIBlurEffect(style: style)
let vibrancyEffect = UIVibrancyEffect(blurEffect: blurEffect)
let vibrancyEffectView = UIVisualEffectView(effect: vibrancyEffect)
vibrancyEffectView.alpha = 0.0
self.vibrancyEffectView = vibrancyEffectView
self.mediaRecordingVibrancyContainer = UIView()
@ -791,6 +792,9 @@ public final class MessageInputPanelComponent: Component {
transition.setFrame(view: self.vibrancyEffectView, frame: CGRect(origin: CGPoint(), size: fieldBackgroundFrame.size))
self.vibrancyEffectView.isHidden = component.style == .media
if isEditing {
self.vibrancyEffectView.alpha = 1.0
}
transition.setFrame(view: self.fieldBackgroundView, frame: fieldBackgroundFrame)
self.fieldBackgroundView.update(size: fieldBackgroundFrame.size, cornerRadius: baseFieldHeight * 0.5, transition: transition.containedViewLayoutTransition)

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

@ -919,6 +919,8 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScr
public var openCurrentDate: (() -> Void)?
public var paneDidScroll: (() -> Void)?
public var emptyAction: (() -> Void)?
public var ensureRectVisible: ((UIView, CGRect) -> Void)?
private weak var currentGestureItem: SparseItemGridDisplayItem?
@ -1116,6 +1118,21 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScr
self.itemInteraction.hiddenMedia = Set([itemId.id])
if let items = self.items, let item = items.items.first(where: { $0.id == AnyHashable(itemId.id) }) {
self.itemGrid.ensureItemVisible(index: item.index, anyAmount: anyAmount)
if !anyAmount {
var foundItemLayer: SparseItemGridLayer?
self.itemGrid.forEachVisibleItem { item in
guard let itemLayer = item.layer as? ItemLayer else {
return
}
if let listItem = itemLayer.item, listItem.story.id == itemId.id {
foundItemLayer = itemLayer
}
}
if let foundItemLayer {
self.ensureRectVisible?(self.view, self.itemGrid.frameForItem(layer: foundItemLayer))
}
}
}
} else {
self.itemInteraction.hiddenMedia = Set()

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

@ -1550,7 +1550,8 @@ private final class StoryContainerScreenComponent: Component {
closeFriends: self.closeFriendsPromise,
blockedPeers: self.blockedPeers,
sharedViewListsContext: self.sharedViewListsContext,
stealthModeTimeout: stealthModeTimeout
stealthModeTimeout: stealthModeTimeout,
isDismissed: self.isDismissedExlusively
)),
environment: {},
containerSize: itemSetContainerSize
@ -1697,6 +1698,7 @@ private final class StoryContainerScreenComponent: Component {
itemSetView.removeFromSuperview()
if let view = itemSetView.view.view as? StoryItemSetContainerComponent.View {
view.saveDraft()
view.transitionCloneContainerView.removeFromSuperview()
}
}

33
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemContentComponent.swift
View File

@ -280,6 +280,10 @@ final class StoryItemContentComponent: Component {
if self.progressMode != progressMode {
self.progressMode = progressMode
self.updateProgressMode(update: true)
if let component = self.component, !self.overlaysView.bounds.isEmpty {
self.updateOverlays(component: component, size: self.overlaysView.bounds.size, synchronousLoad: false, transition: .immediate)
}
}
}
@ -483,6 +487,22 @@ final class StoryItemContentComponent: Component {
return nil
}
private func updateOverlays(component: StoryItemContentComponent, size: CGSize, synchronousLoad: Bool, transition: Transition) {
self.overlaysView.update(
context: component.context,
strings: component.strings,
peer: component.peer,
story: component.item,
availableReactions: component.availableReactions,
entityFiles: component.entityFiles,
size: size,
isCaptureProtected: component.item.isForwardingDisabled,
attemptSynchronous: synchronousLoad,
isActive: self.progressMode == .play,
transition: transition
)
}
func update(component: StoryItemContentComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<StoryContentItem.Environment>, transition: Transition) -> CGSize {
let previousItem = self.component?.item
@ -610,18 +630,7 @@ final class StoryItemContentComponent: Component {
attemptSynchronous: synchronousLoad,
transition: transition
)
self.overlaysView.update(
context: component.context,
strings: component.strings,
peer: component.peer,
story: component.item,
availableReactions: component.availableReactions,
entityFiles: component.entityFiles,
size: availableSize,
isCaptureProtected: component.item.isForwardingDisabled,
attemptSynchronous: synchronousLoad,
transition: transition
)
self.updateOverlays(component: component, size: availableSize, synchronousLoad: synchronousLoad, transition: transition)
applyState = true
if self.imageView.isContentLoaded {
self.contentLoaded = true

45
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemOverlaysView.swift
View File

@ -19,6 +19,38 @@ import AnimatedCountLabelNode
import LottieComponent
import LottieComponentResourceContent
public final class StaticStoryItemOverlaysView: UIImageView {
override public init(frame: CGRect) {
super.init(frame: frame)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
deinit {
}
public func update(
context: AccountContext,
peer: EnginePeer,
story: EngineStoryItem,
availableReactions: StoryAvailableReactions?,
entityFiles: [MediaId: TelegramMediaFile]
) {
}
override public func draw(_ rect: CGRect) {
guard let context = UIGraphicsGetCurrentContext() else {
return
}
let _ = context
}
}
final class StoryItemOverlaysView: UIView {
static let counterFont: UIFont = {
return Font.with(size: 17.0, design: .camera, weight: .semibold, traits: .monospacedNumbers)
@ -105,7 +137,8 @@ final class StoryItemOverlaysView: UIView {
availableReactions: StoryAvailableReactions?,
entityFiles: [MediaId: TelegramMediaFile],
synchronous: Bool,
size: CGSize
size: CGSize,
isActive: Bool
) {
var transition = Transition(animation: .curve(duration: 0.18, curve: .easeInOut))
if self.reaction == nil {
@ -291,9 +324,11 @@ final class StoryItemOverlaysView: UIView {
stickerTransition.setPosition(view: customEmojiView, position: stickerFrame.center)
stickerTransition.setBounds(view: customEmojiView, bounds: CGRect(origin: CGPoint(), size: stickerFrame.size))
stickerTransition.setScale(view: customEmojiView, scale: stickerScale)
customEmojiView.isActive = isActive
}
if let directStickerView = self.directStickerView?.view {
if let directStickerView = self.directStickerView?.view as? LottieComponent.View {
var stickerTransition = transition
if directStickerView.superview == nil {
self.addSubview(directStickerView)
@ -314,6 +349,8 @@ final class StoryItemOverlaysView: UIView {
stickerTransition.setPosition(view: directStickerView, position: stickerFrame.center)
stickerTransition.setBounds(view: directStickerView, bounds: CGRect(origin: CGPoint(), size: stickerFrame.size))
stickerTransition.setScale(view: directStickerView, scale: stickerScale)
directStickerView.externalShouldPlay = isActive
}
}
}
@ -352,6 +389,7 @@ final class StoryItemOverlaysView: UIView {
size: CGSize,
isCaptureProtected: Bool,
attemptSynchronous: Bool,
isActive: Bool,
transition: Transition
) {
var nextId = 0
@ -400,7 +438,8 @@ final class StoryItemOverlaysView: UIView {
availableReactions: availableReactions,
entityFiles: entityFiles,
synchronous: attemptSynchronous,
size: targetFrame.size
size: targetFrame.size,
isActive: isActive
)
nextId += 1

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

@ -124,6 +124,7 @@ public final class StoryItemSetContainerComponent: Component {
public let blockedPeers: BlockedPeersContext?
let sharedViewListsContext: StoryItemSetViewListComponent.SharedListsContext
let stealthModeTimeout: Int32?
public let isDismissed: Bool
init(
context: AccountContext,
@ -158,7 +159,8 @@ public final class StoryItemSetContainerComponent: Component {
closeFriends: Promise<[EnginePeer]>,
blockedPeers: BlockedPeersContext?,
sharedViewListsContext: StoryItemSetViewListComponent.SharedListsContext,
stealthModeTimeout: Int32?
stealthModeTimeout: Int32?,
isDismissed: Bool
) {
self.context = context
self.externalState = externalState
@ -193,6 +195,7 @@ public final class StoryItemSetContainerComponent: Component {
self.blockedPeers = blockedPeers
self.sharedViewListsContext = sharedViewListsContext
self.stealthModeTimeout = stealthModeTimeout
self.isDismissed = isDismissed
}
public static func ==(lhs: StoryItemSetContainerComponent, rhs: StoryItemSetContainerComponent) -> Bool {
@ -253,6 +256,9 @@ public final class StoryItemSetContainerComponent: Component {
if lhs.stealthModeTimeout != rhs.stealthModeTimeout {
return false
}
if lhs.isDismissed != rhs.isDismissed {
return false
}
return true
}
@ -476,10 +482,13 @@ public final class StoryItemSetContainerComponent: Component {
private var isAnimatingOut: Bool = false
private var scheduledStoryUnpinnedUndoOverlay: ViewController?
override init(frame: CGRect) {
self.sendMessageContext = StoryItemSetContainerSendMessage()
self.componentContainerView = UIView()
self.overlayContainerView = SparseContainerView()
self.itemsContainerView = UIView()
@ -2017,6 +2026,14 @@ public final class StoryItemSetContainerComponent: Component {
}
func animateOut(transitionOut: StoryContainerScreen.TransitionOut, transitionCloneMasterView: UIView, completion: @escaping () -> Void) {
func fixScale(layer: CALayer) {
layer.rasterizationScale = UIScreenScale
for sublayer in layer.sublayers ?? [] {
fixScale(layer: sublayer)
}
}
var cleanups: [() -> Void] = []
self.isAnimatingOut = true
@ -2142,6 +2159,7 @@ public final class StoryItemSetContainerComponent: Component {
var transitionViewsImpl: [UIView] = []
if let transitionViewImpl = transitionView?.makeView() {
fixScale(layer: transitionViewImpl.layer)
transitionViewsImpl.append(transitionViewImpl)
let transitionSourceContainerView = UIView(frame: self.bounds)
@ -2152,6 +2170,7 @@ public final class StoryItemSetContainerComponent: Component {
if let insertCloneTransitionView = transitionView?.insertCloneTransitionView {
if let transitionCloneViewImpl = transitionView?.makeView() {
fixScale(layer: transitionCloneViewImpl.layer)
transitionViewsImpl.append(transitionCloneViewImpl)
transitionCloneMasterView.isUserInteractionEnabled = false
@ -2262,6 +2281,7 @@ public final class StoryItemSetContainerComponent: Component {
var transitionViewsImpl: [UIView] = []
if let transitionViewImpl = transitionView?.makeView() {
fixScale(layer: transitionViewImpl.layer)
transitionViewsImpl.append(transitionViewImpl)
let transitionSourceContainerView = UIView(frame: self.bounds)
@ -2272,6 +2292,7 @@ public final class StoryItemSetContainerComponent: Component {
if let insertCloneTransitionView = transitionView?.insertCloneTransitionView {
if let transitionCloneViewImpl = transitionView?.makeView() {
fixScale(layer: transitionCloneViewImpl.layer)
transitionViewsImpl.append(transitionCloneViewImpl)
transitionCloneMasterView.isUserInteractionEnabled = false
@ -2413,6 +2434,19 @@ public final class StoryItemSetContainerComponent: Component {
let _ = ApplicationSpecificNotice.setDisplayStoryReactionTooltip(accountManager: component.context.sharedContext.accountManager).start()
}
func saveDraft() {
guard let component = self.component else {
return
}
if let inputPanelView = self.inputPanel.view as? MessageInputPanelComponent.View {
let previousInput = inputPanelView.getSendMessageInput()
switch previousInput {
case let .text(value):
component.storyItemSharedState.replyDrafts[StoryId(peerId: component.slice.peer.id, id: component.slice.item.storyItem.id)] = value
}
}
}
func update(component: StoryItemSetContainerComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: Transition) -> CGSize {
let isFirstTime = self.component == nil
@ -2448,15 +2482,7 @@ public final class StoryItemSetContainerComponent: Component {
resetInputContents = .text(NSAttributedString())
if let inputPanelView = self.inputPanel.view as? MessageInputPanelComponent.View {
if let previousComponent = self.component {
let previousInput = inputPanelView.getSendMessageInput()
switch previousInput {
case let .text(value):
component.storyItemSharedState.replyDrafts[StoryId(peerId: previousComponent.slice.peer.id, id: previousComponent.slice.item.storyItem.id)] = value
}
}
}
self.saveDraft()
if let draft = component.storyItemSharedState.replyDrafts[StoryId(peerId: component.slice.peer.id, id: component.slice.item.storyItem.id)] {
resetInputContents = .text(draft)
}
@ -4590,6 +4616,13 @@ public final class StoryItemSetContainerComponent: Component {
)
}
if let scheduledStoryUnpinnedUndoOverlay = self.scheduledStoryUnpinnedUndoOverlay {
self.scheduledStoryUnpinnedUndoOverlay = nil
if !self.isAnimatingOut && !component.isDismissed {
component.presentController(scheduledStoryUnpinnedUndoOverlay, nil)
}
}
return contentSize
}
@ -5247,8 +5280,26 @@ public final class StoryItemSetContainerComponent: Component {
}
if component.slice.peer.id == component.context.account.peerId {
self.performMyMoreAction(sourceView: sourceView, gesture: gesture)
} else if case let .channel(channel) = component.slice.peer, channel.hasPermission(.sendSomething) {
self.performMyChannelMoreAction(sourceView: sourceView, gesture: gesture)
} else if case let .channel(channel) = component.slice.peer {
var canPerformStoryActions = false
if channel.hasPermission(.editStories) {
canPerformStoryActions = true
} else if component.slice.item.storyItem.isMy && channel.hasPermission(.postStories) {
canPerformStoryActions = true
}
if channel.hasPermission(.deleteStories) {
canPerformStoryActions = true
} else if component.slice.item.storyItem.isMy && channel.hasPermission(.postStories) {
canPerformStoryActions = true
}
if canPerformStoryActions {
self.performMyChannelMoreAction(sourceView: sourceView, gesture: gesture)
} else {
self.performOtherMoreAction(sourceView: sourceView, gesture: gesture)
}
} else {
self.performOtherMoreAction(sourceView: sourceView, gesture: gesture)
}
@ -5265,9 +5316,13 @@ public final class StoryItemSetContainerComponent: Component {
}
var likeButtonView: UIView?
var addTracingOffset: ((UIView) -> Void)?
if let visibleItem = self.visibleItems[component.slice.item.storyItem.id], let footerPanelView = visibleItem.footerPanel?.view as? StoryFooterPanelComponent.View {
likeButtonView = footerPanelView.likeButtonView
addTracingOffset = { [weak footerPanelView] view in
footerPanelView?.setLikeButtonTracingOffset(view: view)
}
} else {
guard let inputPanelView = self.inputPanel.view as? MessageInputPanelComponent.View else {
return
@ -5338,6 +5393,8 @@ public final class StoryItemSetContainerComponent: Component {
standaloneReactionAnimation?.view.removeFromSuperview()
}
)
addTracingOffset?(standaloneReactionAnimation.view)
}
if component.slice.item.storyItem.myReaction != nil {
@ -5721,14 +5778,14 @@ public final class StoryItemSetContainerComponent: Component {
let presentationData = component.context.sharedContext.currentPresentationData.with({ $0 }).withUpdated(theme: component.theme)
//TODO:localize
if component.slice.item.storyItem.isPinned {
self.component?.presentController(UndoOverlayController(
self.scheduledStoryUnpinnedUndoOverlay = UndoOverlayController(
presentationData: presentationData,
content: .info(title: nil, text: "Story removed from the channel's profile", timeout: nil),
elevatedLayout: false,
animateInAsReplacement: false,
blurred: true,
action: { _ in return false }
), nil)
)
} else {
self.component?.presentController(UndoOverlayController(
presentationData: presentationData,
@ -6016,20 +6073,22 @@ public final class StoryItemSetContainerComponent: Component {
})))
}
items.append(.action(ContextMenuActionItem(text: component.strings.Story_ContextStealthMode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: accountUser.isPremium ? "Chat/Context Menu/Eye" : "Chat/Context Menu/EyeLocked"), color: theme.contextMenu.primaryColor)
}, action: { [weak self] _, a in
a(.default)
guard let self else {
return
}
if accountUser.isPremium {
self.sendMessageContext.requestStealthMode(view: self)
} else {
self.presentStealthModeUpgradeScreen()
}
})))
if case .user = component.slice.peer {
items.append(.action(ContextMenuActionItem(text: component.strings.Story_ContextStealthMode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: accountUser.isPremium ? "Chat/Context Menu/Eye" : "Chat/Context Menu/EyeLocked"), color: theme.contextMenu.primaryColor)
}, action: { [weak self] _, a in
a(.default)
guard let self else {
return
}
if accountUser.isPremium {
self.sendMessageContext.requestStealthMode(view: self)
} else {
self.presentStealthModeUpgradeScreen()
}
})))
}
if !component.slice.peer.isService && component.slice.item.storyItem.isPublic && (component.slice.peer.addressName != nil || !component.slice.peer._asPeer().usernames.isEmpty) {
items.append(.action(ContextMenuActionItem(text: component.strings.Story_Context_CopyLink, icon: { theme in

13
submodules/TelegramUI/Components/Stories/StoryFooterPanelComponent/Sources/StoryFooterPanelComponent.swift
View File

@ -137,6 +137,8 @@ public final class StoryFooterPanelComponent: Component {
public let externalContainerView: UIView
private weak var likeButtonTracingOffsetView: UIView?
public var likeButtonView: UIView? {
return self.likeButton?.view
}
@ -197,6 +199,10 @@ public final class StoryFooterPanelComponent: Component {
self.uploadProgressDisposable?.dispose()
}
public func setLikeButtonTracingOffset(view: UIView) {
self.likeButtonTracingOffsetView = view
}
@objc private func viewStatsPressed() {
guard let component = self.component else {
return
@ -457,6 +463,13 @@ public final class StoryFooterPanelComponent: Component {
var likeButtonFrame = CGRect(origin: CGPoint(x: rightContentOffset - likeButtonSize.width, y: floor((size.height - likeButtonSize.height) * 0.5)), size: likeButtonSize)
likeButtonFrame.origin.y += component.expandFraction * 45.0
if let likeButtonTracingOffsetView = self.likeButtonTracingOffsetView {
let difference = CGPoint(x: likeButtonFrame.midX - likeButtonView.layer.position.x, y: likeButtonFrame.midY - likeButtonView.layer.position.y)
if difference != CGPoint() {
likeStatsTransition.setPosition(view: likeButtonTracingOffsetView, position: likeButtonTracingOffsetView.layer.position.offsetBy(dx: difference.x, dy: difference.y))
}
}
likeStatsTransition.setPosition(view: likeButtonView, position: likeButtonFrame.center)
likeStatsTransition.setBounds(view: likeButtonView, bounds: CGRect(origin: CGPoint(), size: likeButtonFrame.size))
likeStatsTransition.setAlpha(view: likeButtonView, alpha: 1.0 - component.expandFraction)

1
submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListItemComponent.swift
View File

@ -321,6 +321,7 @@ public final class StoryPeerListItemComponent: Component {
if let itemView {
if let portalView = PortalView(matchPosition: false) {
portalView.view.layer.rasterizationScale = UIScreenScale
itemView.avatarContent.addPortal(view: portalView)
self.portalView = portalView
self.addSubview(portalView.view)

18
submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
View File

@ -362,7 +362,8 @@ private final class PeerInfoPendingPane {
hasBecomeReady: @escaping (PeerInfoPaneKey) -> Void,
parentController: ViewController?,
openMediaCalendar: @escaping () -> Void,
paneDidScroll: @escaping () -> Void
paneDidScroll: @escaping () -> Void,
ensureRectVisible: @escaping (UIView, CGRect) -> Void
) {
let captureProtected = data.peer?.isCopyProtectionEnabled ?? false
let paneNode: PeerInfoPaneNode
@ -376,6 +377,9 @@ private final class PeerInfoPendingPane {
visualPaneNode.paneDidScroll = {
paneDidScroll()
}
visualPaneNode.ensureRectVisible = { sourceView, rect in
ensureRectVisible(sourceView, rect)
}
case .media:
let visualPaneNode = PeerInfoVisualMediaPaneNode(context: context, chatControllerInteraction: chatControllerInteraction, peerId: peerId, chatLocation: chatLocation, chatLocationContextHolder: chatLocationContextHolder, contentType: .photoOrVideo, captureProtected: captureProtected)
paneNode = visualPaneNode
@ -487,6 +491,8 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
var openMediaCalendar: (() -> Void)?
var paneDidScroll: (() -> Void)?
var ensurePaneRectVisible: ((UIView, CGRect) -> Void)?
private var currentAvailablePanes: [PeerInfoPaneKey]?
private let updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?
@ -698,6 +704,10 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
let previousCurrentPaneKey = self.currentPaneKey
var updateCurrentPaneStatus = false
if let previousAvailablePanes, !previousAvailablePanes.contains(.stories), availablePanes.contains(.stories) {
self.pendingSwitchToPaneKey = .stories
}
if let currentPaneKey = self.currentPaneKey, !availablePanes.contains(currentPaneKey) {
var nextCandidatePaneKey: PeerInfoPaneKey?
if let previousAvailablePanes = previousAvailablePanes, let index = previousAvailablePanes.firstIndex(of: currentPaneKey), index != 0 {
@ -816,6 +826,12 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
},
paneDidScroll: { [weak self] in
self?.paneDidScroll?()
},
ensureRectVisible: { [weak self] sourceView, rect in
guard let self else {
return
}
self.ensurePaneRectVisible?(self.view, sourceView.convert(rect, to: self.view))
}
)
self.pendingPanes[key] = pane

29
submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
View File

@ -2982,6 +2982,35 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
return false
}
}
self.paneContainerNode.ensurePaneRectVisible = { [weak self] sourceView, rect in
guard let self else {
return
}
let localRect = sourceView.convert(rect, to: self.view)
if !self.view.bounds.insetBy(dx: -1000.0, dy: 0.0).contains(localRect) {
guard let (_, navigationHeight) = self.validLayout else {
return
}
if self.headerNode.isAvatarExpanded {
let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .spring)
self.headerNode.updateIsAvatarExpanded(false, transition: transition)
self.updateNavigationExpansionPresentation(isExpanded: false, animated: true)
if let (layout, navigationHeight) = self.validLayout {
self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: transition, additive: true)
}
}
let contentOffset = self.scrollNode.view.contentOffset
let paneAreaExpansionFinalPoint: CGFloat = self.paneContainerNode.frame.minY - navigationHeight
if contentOffset.y < paneAreaExpansionFinalPoint - CGFloat.ulpOfOne {
self.scrollNode.view.setContentOffset(CGPoint(x: 0.0, y: paneAreaExpansionFinalPoint), animated: false)
}
}
}
self.paneContainerNode.openMediaCalendar = { [weak self] in
guard let strongSelf = self else {