ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-04-06 15:01:03 +04:00
parent 088cdc0939
commit 0598c49a89
79 changed files with 2478 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
View File

@@ -540,8 +540,11 @@ private final class StickerPackContainer: ASDisplayNode {
f(.default)
if let strongSelf = self {
let _ = strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred).start(next: { _ in
let _ = (strongSelf.context.engine.stickers.toggleStickerSaved(file: item.file, saved: !isStarred)
|> deliverOnMainQueue).start(next: { [weak self] result in
if let self, let contorller = self.controller, case .generic = result {
contorller.present(UndoOverlayController(presentationData: self.presentationData, content: .sticker(context: context, file: item.file, loop: true, title: nil, text: !isStarred ? self.presentationData.strings.Conversation_StickerAddedToFavorites : self.presentationData.strings.Conversation_StickerRemovedFromFavorites, undoText: nil, customAction: nil), elevatedLayout: false, action: { _ in return false }), in: .window(.root))
}
})
}
})))
@@ -967,7 +970,9 @@ private final class StickerPackContainer: ASDisplayNode {
let buttonColor: UIColor
var buttonFont: UIFont = Font.semibold(17.0)
if let controller = self.controller, let _ = controller.mainActionTitle {
if self.isEditing {
buttonColor = self.presentationData.theme.list.itemCheckColors.foregroundColor
} else if let controller = self.controller, let _ = controller.mainActionTitle {
buttonColor = self.presentationData.theme.list.itemCheckColors.foregroundColor
} else {
switch currentContents {
@@ -1037,6 +1042,10 @@ private final class StickerPackContainer: ASDisplayNode {
if let (layout, _, _, _) = self.validLayout {
self.updateLayout(layout: layout, transition: .animated(duration: 0.3, curve: .easeInOut))
}
if isEditing {
self.expandIfNeeded(force: true)
}
}
@objc private func morePressed(node: ContextReferenceContentNode, gesture: ContextGesture?) {
@@ -2122,14 +2131,18 @@ private final class StickerPackContainer: ASDisplayNode {
return
}
if self.currentEntries.count >= 15, self.controller?.expandIfNeeded == true, !self.didAutomaticExpansion {
self.didAutomaticExpansion = true
self.gridNode.autoscroll(toOffset: CGPoint(x: 0.0, y: max(0.0, self.gridNode.scrollView.contentSize.height - self.gridNode.scrollView.contentInset.top - self.gridNode.scrollView.bounds.height)), duration: 0.4)
self.skipNextGridLayoutUpdate = true
}
self.expandIfNeeded()
})
}
private func expandIfNeeded(force: Bool = false) {
if self.currentEntries.count >= 15, force || (self.controller?.expandIfNeeded == true && !self.didAutomaticExpansion) {
self.didAutomaticExpansion = true
self.gridNode.autoscroll(toOffset: CGPoint(x: 0.0, y: max(0.0, self.gridNode.scrollView.contentSize.height - self.gridNode.scrollView.contentInset.top - self.gridNode.scrollView.bounds.height)), duration: 0.4)
self.skipNextGridLayoutUpdate = true
}
}
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
if self.bounds.contains(point) {
if !self.backgroundNode.bounds.contains(self.convert(point, to: self.backgroundNode)) {