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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-12-25 10:33:53 +04:00
parent 6ece02e998
commit a0f3cfef58
27 changed files with 779 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
submodules/DrawingUI/Sources/StickerPickerScreen.swift
View File

@@ -209,7 +209,6 @@ class StickerPickerScreen: ViewController {
let dim: ASDisplayNode
let wrappingView: UIView
let containerView: UIView
let scrollView: UIScrollView
let hostView: ComponentHostView<Empty>
private var content: StickerPickerInputData?
@@ -234,16 +233,12 @@ class StickerPickerScreen: ViewController {
self.dim.alpha = 0.0
self.dim.backgroundColor = UIColor(white: 0.0, alpha: 0.25)
self.wrappingView = UIView()
self.containerView = UIView()
self.scrollView = UIScrollView()
self.wrappingView = SparseContainerView()
self.containerView = SparseContainerView()
self.hostView = ComponentHostView()
super.init()
self.scrollView.delegate = self
self.scrollView.showsVerticalScrollIndicator = false
self.containerView.clipsToBounds = true
self.containerView.backgroundColor = .clear
@@ -251,8 +246,7 @@ class StickerPickerScreen: ViewController {
self.view.addSubview(self.wrappingView)
self.wrappingView.addSubview(self.containerView)
self.containerView.addSubview(self.scrollView)
self.scrollView.addSubview(self.hostView)
self.containerView.addSubview(self.hostView)
self.contentDisposable.set(controller.inputData.start(next: { [weak self] inputData in
if let strongSelf = self {
@@ -359,6 +353,9 @@ class StickerPickerScreen: ViewController {
},
updateSearchQuery: { _, _ in
},
updateScrollingToItemGroup: { [weak self] in
self?.update(isExpanded: true, transition: .animated(duration: 0.4, curve: .spring))
},
chatPeerId: nil,
peekBehavior: nil,
customLayout: nil,
@@ -433,6 +430,9 @@ class StickerPickerScreen: ViewController {
},
updateSearchQuery: { _, _ in
},
updateScrollingToItemGroup: { [weak self] in
self?.update(isExpanded: true, transition: .animated(duration: 0.4, curve: .spring))
},
chatPeerId: nil,
peekBehavior: nil,
customLayout: nil,
@@ -554,6 +554,9 @@ class StickerPickerScreen: ViewController {
},
updateSearchQuery: { _, _ in
},
updateScrollingToItemGroup: { [weak self] in
self?.update(isExpanded: true, transition: .animated(duration: 0.4, curve: .spring))
},
chatPeerId: nil,
peekBehavior: stickerPeekBehavior,
customLayout: nil,
@@ -599,11 +602,6 @@ class StickerPickerScreen: ViewController {
return true
}
func scrollViewDidScroll(_ scrollView: UIScrollView) {
let contentOffset = self.scrollView.contentOffset.y
self.controller?.navigationBar?.updateBackgroundAlpha(min(30.0, contentOffset) / 30.0, transition: .immediate)
}
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
if gestureRecognizer is UIPanGestureRecognizer && otherGestureRecognizer is UIPanGestureRecognizer {
if otherGestureRecognizer is PagerPanGestureRecognizer {
@@ -727,7 +725,6 @@ class StickerPickerScreen: ViewController {
}
transition.setFrame(view: self.containerView, frame: clipFrame)
transition.setFrame(view: self.scrollView, frame: CGRect(origin: CGPoint(), size: clipFrame.size), completion: nil)
if let content = self.content {
var stickersTransition: Transition = transition
@@ -756,7 +753,6 @@ class StickerPickerScreen: ViewController {
)
contentSize.height = max(layout.size.height - navigationHeight, contentSize.height)
transition.setFrame(view: self.hostView, frame: CGRect(origin: CGPoint(), size: contentSize), completion: nil)
self.scrollView.contentSize = contentSize
}
}
@@ -817,11 +813,10 @@ class StickerPickerScreen: ViewController {
let point = recognizer.location(in: self.view)
let currentHitView = self.hitTest(point, with: nil)
var scrollViewAndListNode = self.findScrollView(view: currentHitView)
if scrollViewAndListNode?.frame.height == self.frame.width {
scrollViewAndListNode = nil
var scrollView = self.findScrollView(view: currentHitView)
if scrollView?.frame.height == self.frame.width {
scrollView = nil
}
let scrollView = scrollViewAndListNode
let topInset: CGFloat
if self.isExpanded {