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

no message

Browse Source
This commit is contained in:
Peter 2018-09-17 19:15:29 +01:00
parent eba4688764
commit bffb8eb8ca
4 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Display/ListView.swift
View File

@ -199,7 +199,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
public final var beganInteractiveDragging: () -> Void = { } public final var beganInteractiveDragging: () -> Void = { }
public final var didEndScrolling: (() -> Void)? public final var didEndScrolling: (() -> Void)?
public final var reorderItem: (Int, Int, Any?) -> Void = { _, _, _ in } public final var reorderItem: (Int, Int, Any?) -> Signal<Bool, NoError> = { _, _, _ in return .single(false) }
private final var animations: [ListViewAnimation] = [] private final var animations: [ListViewAnimation] = []
private final var actionsForVSync: [() -> ()] = [] private final var actionsForVSync: [() -> ()] = []
@ -216,16 +216,10 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
private var flashNodesDelayTimer: Foundation.Timer? private var flashNodesDelayTimer: Foundation.Timer?
private var highlightedItemIndex: Int? private var highlightedItemIndex: Int?
private var reorderNode: ListViewReorderingItemNode? private var reorderNode: ListViewReorderingItemNode?
private var reorderFeedback: HapticFeedback?
private var reorderFeedbackDisposable: MetaDisposable?
private let waitingForNodesDisposable = MetaDisposable() private let waitingForNodesDisposable = MetaDisposable()
public func reportDurationInMS(duration: Int, smallDropEvent: Double, largeDropEvent: Double) {
print("reportDurationInMS duration: \(duration), smallDropEvent: \(smallDropEvent), largeDropEvent: \(largeDropEvent)")
}
public func reportStackTrace(stack: String!, withSlide slide: String!) {
NSLog("reportStackTrace stack: \(stack)\n\nslide: \(slide)")
}
override public init() { override public init() {
class DisplayLinkProxy: NSObject { class DisplayLinkProxy: NSObject {
@ -331,6 +325,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} }
self.waitingForNodesDisposable.dispose() self.waitingForNodesDisposable.dispose()
self.reorderFeedbackDisposable?.dispose()
} }
private func displayLinkEvent() { private func displayLinkEvent() {
@ -435,7 +430,19 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
if reorderNode.currentState?.0 != reorderItemIndex || reorderNode.currentState?.1 != toIndex { if reorderNode.currentState?.0 != reorderItemIndex || reorderNode.currentState?.1 != toIndex {
reorderNode.currentState = (reorderItemIndex, toIndex) reorderNode.currentState = (reorderItemIndex, toIndex)
//print("reorder \(reorderItemIndex) to \(toIndex) offset \(offset)") //print("reorder \(reorderItemIndex) to \(toIndex) offset \(offset)")
self.reorderItem(reorderItemIndex, toIndex, self.opaqueTransactionState) if self.reorderFeedbackDisposable == nil {
self.reorderFeedbackDisposable = MetaDisposable()
}
self.reorderFeedbackDisposable?.set((self.reorderItem(reorderItemIndex, toIndex, self.opaqueTransactionState)
|> deliverOnMainQueue).start(next: { [weak self] value in
guard let strongSelf = self, value else {
return
}
if strongSelf.reorderFeedback == nil {
strongSelf.reorderFeedback = HapticFeedback()
}
strongSelf.reorderFeedback?.tap()
}))
} }
} }
} }
@ -1098,7 +1105,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
DispatchQueue.global().async(execute: f) DispatchQueue.global().async(execute: f)
} }
private func nodeForItem(synchronous: Bool, item: ListViewItem, previousNode: ListViewItemNode?, index: Int, previousItem: ListViewItem?, nextItem: ListViewItem?, params: ListViewItemLayoutParams, updateAnimation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNode, ListViewItemNodeLayout, @escaping () -> (Signal<Void, NoError>?, () -> Void)) -> Void) { private func nodeForItem(synchronous: Bool, item: ListViewItem, previousNode: QueueLocalObject<ListViewItemNode>?, index: Int, previousItem: ListViewItem?, nextItem: ListViewItem?, params: ListViewItemLayoutParams, updateAnimation: ListViewItemUpdateAnimation, completion: @escaping (QueueLocalObject<ListViewItemNode>, ListViewItemNodeLayout, @escaping () -> (Signal<Void, NoError>?, () -> Void)) -> Void) {
if let previousNode = previousNode { if let previousNode = previousNode {
item.updateNode(async: { f in item.updateNode(async: { f in
if synchronous { if synchronous {
@ -1106,12 +1113,16 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} else { } else {
self.async(f) self.async(f)
} }
}, node: previousNode, params: params, previousItem: previousItem, nextItem: nextItem, animation: updateAnimation, completion: { (layout, apply) in }, node: {
assert(Queue.mainQueue().isCurrent())
return previousNode.syncWith({ $0 })!
}, params: params, previousItem: previousItem, nextItem: nextItem, animation: updateAnimation, completion: { (layout, apply) in
if Thread.isMainThread { if Thread.isMainThread {
if synchronous { if synchronous {
completion(previousNode, layout, { completion(previousNode, layout, {
return (nil, { return (nil, {
previousNode.index = index assert(Queue.mainQueue().isCurrent())
previousNode.with({ $0.index = index })
apply() apply()
}) })
}) })
@ -1119,7 +1130,8 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
self.async { self.async {
completion(previousNode, layout, { completion(previousNode, layout, {
return (nil, { return (nil, {
previousNode.index = index assert(Queue.mainQueue().isCurrent())
previousNode.with({ $0.index = index })
apply() apply()
}) })
}) })
@ -1128,7 +1140,8 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} else { } else {
completion(previousNode, layout, { completion(previousNode, layout, {
return (nil, { return (nil, {
previousNode.index = index assert(Queue.mainQueue().isCurrent())
previousNode.with({ $0.index = index })
apply() apply()
}) })
}) })
@ -1142,8 +1155,9 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
self.async(f) self.async(f)
} }
}, params: params, previousItem: previousItem, nextItem: nextItem, completion: { itemNode, apply in }, params: params, previousItem: previousItem, nextItem: nextItem, completion: { itemNode, apply in
//assert(Queue.mainQueue().isCurrent())
itemNode.index = index itemNode.index = index
completion(itemNode, ListViewItemNodeLayout(contentSize: itemNode.contentSize, insets: itemNode.insets), apply) completion(QueueLocalObject(queue: Queue.mainQueue(), generate: { return itemNode }), ListViewItemNodeLayout(contentSize: itemNode.contentSize, insets: itemNode.insets), apply)
}) })
} }
} }
@ -1153,7 +1167,9 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
nodes.reserveCapacity(self.itemNodes.count) nodes.reserveCapacity(self.itemNodes.count)
for node in self.itemNodes { for node in self.itemNodes {
if let index = node.index { if let index = node.index {
nodes.append(.Node(index: index, frame: node.apparentFrame, referenceNode: node)) nodes.append(.Node(index: index, frame: node.apparentFrame, referenceNode: QueueLocalObject(queue: Queue.mainQueue(), generate: {
return node
})))
} else { } else {
nodes.append(.Placeholder(frame: node.apparentFrame)) nodes.append(.Placeholder(frame: node.apparentFrame))
} }
@ -1226,13 +1242,13 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} }
} }
var previousNodes: [Int: ListViewItemNode] = [:] var previousNodes: [Int: QueueLocalObject<ListViewItemNode>] = [:]
for insertedItem in sortedIndicesAndItems { for insertedItem in sortedIndicesAndItems {
self.items.insert(insertedItem.item, at: insertedItem.index) self.items.insert(insertedItem.item, at: insertedItem.index)
if let previousIndex = insertedItem.previousIndex { if let previousIndex = insertedItem.previousIndex {
for itemNode in self.itemNodes { for itemNode in self.itemNodes {
if itemNode.index == previousIndex { if itemNode.index == previousIndex {
previousNodes[insertedItem.index] = itemNode previousNodes[insertedItem.index] = QueueLocalObject(queue: Queue.mainQueue(), generate: { return itemNode })
} }
} }
} }
@ -1242,7 +1258,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
self.items[updatedItem.index] = updatedItem.item self.items[updatedItem.index] = updatedItem.item
for itemNode in self.itemNodes { for itemNode in self.itemNodes {
if itemNode.index == updatedItem.previousIndex { if itemNode.index == updatedItem.previousIndex {
previousNodes[updatedItem.index] = itemNode previousNodes[updatedItem.index] = QueueLocalObject(queue: Queue.mainQueue(), generate: { return itemNode })
break break
} }
} }
@ -1539,7 +1555,10 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} else { } else {
self.async(f) self.async(f)
} }
}, node: referenceNode, params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right), previousItem: index == 0 ? nil : self.items[index - 1], nextItem: index == self.items.count - 1 ? nil : self.items[index + 1], animation: updateAnimation, completion: { layout, apply in }, node: {
assert(Queue.mainQueue().isCurrent())
return referenceNode.syncWith({ $0 })!
}, params: ListViewItemLayoutParams(width: state.visibleSize.width, leftInset: state.insets.left, rightInset: state.insets.right), previousItem: index == 0 ? nil : self.items[index - 1], nextItem: index == self.items.count - 1 ? nil : self.items[index + 1], animation: updateAnimation, completion: { layout, apply in
var updatedState = state var updatedState = state
var updatedOperations = operations var updatedOperations = operations
@ -1579,7 +1598,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} }
} }
private func fillMissingNodes(synchronous: Bool, animated: Bool, inputAnimatedInsertIndices: Set<Int>, insertDirectionHints: [Int: ListViewItemOperationDirectionHint], inputState: ListViewState, inputPreviousNodes: [Int: ListViewItemNode], inputOperations: [ListViewStateOperation], inputCompletion: @escaping (ListViewState, [ListViewStateOperation]) -> Void) { private func fillMissingNodes(synchronous: Bool, animated: Bool, inputAnimatedInsertIndices: Set<Int>, insertDirectionHints: [Int: ListViewItemOperationDirectionHint], inputState: ListViewState, inputPreviousNodes: [Int: QueueLocalObject<ListViewItemNode>], inputOperations: [ListViewStateOperation], inputCompletion: @escaping (ListViewState, [ListViewStateOperation]) -> Void) {
let animatedInsertIndices = inputAnimatedInsertIndices let animatedInsertIndices = inputAnimatedInsertIndices
var state = inputState var state = inputState
var previousNodes = inputPreviousNodes var previousNodes = inputPreviousNodes
@ -1638,7 +1657,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} }
} }
private func updateNodes(synchronous: Bool, animated: Bool, updateIndicesAndItems: [ListViewUpdateItem], inputState: ListViewState, previousNodes: [Int: ListViewItemNode], inputOperations: [ListViewStateOperation], completion: @escaping (ListViewState, [ListViewStateOperation]) -> Void) { private func updateNodes(synchronous: Bool, animated: Bool, updateIndicesAndItems: [ListViewUpdateItem], inputState: ListViewState, previousNodes: [Int: QueueLocalObject<ListViewItemNode>], inputOperations: [ListViewStateOperation], completion: @escaping (ListViewState, [ListViewStateOperation]) -> Void) {
var state = inputState var state = inputState
var operations = inputOperations var operations = inputOperations
var updateIndicesAndItems = updateIndicesAndItems var updateIndicesAndItems = updateIndicesAndItems
@ -1938,7 +1957,7 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
var takenPreviousNodes = Set<ListViewItemNode>() var takenPreviousNodes = Set<ListViewItemNode>()
for operation in operations { for operation in operations {
if case let .InsertNode(_, _, _, node, _, _) = operation { if case let .InsertNode(_, _, _, node, _, _) = operation {
takenPreviousNodes.insert(node) takenPreviousNodes.insert(node.syncWith({ $0 })!)
} }
} }
@ -1946,7 +1965,8 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
for operation in operations { for operation in operations {
switch operation { switch operation {
case let .InsertNode(index, offsetDirection, nodeAnimated, node, layout, apply): case let .InsertNode(index, offsetDirection, nodeAnimated, nodeObject, layout, apply):
let node = nodeObject.syncWith({ $0 })!
var previousFrame: CGRect? var previousFrame: CGRect?
for (previousNode, frame) in previousApparentFrames { for (previousNode, frame) in previousApparentFrames {
if previousNode === node { if previousNode === node {
@ -1989,10 +2009,12 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
} }
} }
} }
case let .InsertDisappearingPlaceholder(index, referenceNode, offsetDirection): case let .InsertDisappearingPlaceholder(index, referenceNodeObject, offsetDirection):
var height: CGFloat? var height: CGFloat?
var previousLayout: ListViewItemNodeLayout? var previousLayout: ListViewItemNodeLayout?
let referenceNode = referenceNodeObject.syncWith({ $0 })!
for (node, previousFrame) in previousApparentFrames { for (node, previousFrame) in previousApparentFrames {
if node === referenceNode { if node === referenceNode {
height = previousFrame.size.height height = previousFrame.size.height
@ -2004,7 +2026,6 @@ open class ListView: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDel
if let height = height, let previousLayout = previousLayout { if let height = height, let previousLayout = previousLayout {
if takenPreviousNodes.contains(referenceNode) { if takenPreviousNodes.contains(referenceNode) {
let tempNode = ListViewTempItemNode(layerBacked: true) let tempNode = ListViewTempItemNode(layerBacked: true)
//referenceNode.copyHeightAndApparentHeightAnimations(to: tempNode)
self.insertNodeAtIndex(animated: false, animateAlpha: false, forceAnimateInsertion: false, previousFrame: nil, nodeIndex: index, offsetDirection: offsetDirection, node: tempNode, layout: ListViewItemNodeLayout(contentSize: CGSize(width: self.visibleSize.width, height: height), insets: UIEdgeInsets()), apply: { return (nil, {}) }, timestamp: timestamp, listInsets: listInsets) self.insertNodeAtIndex(animated: false, animateAlpha: false, forceAnimateInsertion: false, previousFrame: nil, nodeIndex: index, offsetDirection: offsetDirection, node: tempNode, layout: ListViewItemNodeLayout(contentSize: CGSize(width: self.visibleSize.width, height: height), insets: UIEdgeInsets()), apply: { return (nil, {}) }, timestamp: timestamp, listInsets: listInsets)
} else { } else {
referenceNode.index = nil referenceNode.index = nil

10
Display/ListViewIntermediateState.swift
View File

@ -203,14 +203,14 @@ struct TransactionState {
struct PendingNode { struct PendingNode {
let index: Int let index: Int
let node: ListViewItemNode let node: QueueLocalObject<ListViewItemNode>
let apply: () -> (Signal<Void, NoError>?, () -> Void) let apply: () -> (Signal<Void, NoError>?, () -> Void)
let frame: CGRect let frame: CGRect
let apparentHeight: CGFloat let apparentHeight: CGFloat
} }
enum ListViewStateNode { enum ListViewStateNode {
case Node(index: Int, frame: CGRect, referenceNode: ListViewItemNode?) case Node(index: Int, frame: CGRect, referenceNode: QueueLocalObject<ListViewItemNode>?)
case Placeholder(frame: CGRect) case Placeholder(frame: CGRect)
var index: Int? { var index: Int? {
@ -687,7 +687,7 @@ struct ListViewState {
return height return height
} }
mutating func insertNode(_ itemIndex: Int, node: ListViewItemNode, layout: ListViewItemNodeLayout, apply: @escaping () -> (Signal<Void, NoError>?, () -> Void), offsetDirection: ListViewInsertionOffsetDirection, animated: Bool, operations: inout [ListViewStateOperation], itemCount: Int) { mutating func insertNode(_ itemIndex: Int, node: QueueLocalObject<ListViewItemNode>, layout: ListViewItemNodeLayout, apply: @escaping () -> (Signal<Void, NoError>?, () -> Void), offsetDirection: ListViewInsertionOffsetDirection, animated: Bool, operations: inout [ListViewStateOperation], itemCount: Int) {
let (insertionOrigin, insertionIndex) = self.nodeInsertionPointAndIndex(itemIndex) let (insertionOrigin, insertionIndex) = self.nodeInsertionPointAndIndex(itemIndex)
let nodeOrigin: CGPoint let nodeOrigin: CGPoint
@ -848,8 +848,8 @@ struct ListViewState {
} }
enum ListViewStateOperation { enum ListViewStateOperation {
case InsertNode(index: Int, offsetDirection: ListViewInsertionOffsetDirection, animated: Bool, node: ListViewItemNode, layout: ListViewItemNodeLayout, apply: () -> (Signal<Void, NoError>?, () -> Void)) case InsertNode(index: Int, offsetDirection: ListViewInsertionOffsetDirection, animated: Bool, node: QueueLocalObject<ListViewItemNode>, layout: ListViewItemNodeLayout, apply: () -> (Signal<Void, NoError>?, () -> Void))
case InsertDisappearingPlaceholder(index: Int, referenceNode: ListViewItemNode, offsetDirection: ListViewInsertionOffsetDirection) case InsertDisappearingPlaceholder(index: Int, referenceNode: QueueLocalObject<ListViewItemNode>, offsetDirection: ListViewInsertionOffsetDirection)
case Remove(index: Int, offsetDirection: ListViewInsertionOffsetDirection) case Remove(index: Int, offsetDirection: ListViewInsertionOffsetDirection)
case Remap([Int: Int]) case Remap([Int: Int])
case UpdateLayout(index: Int, layout: ListViewItemNodeLayout, apply: () -> (Signal<Void, NoError>?, () -> Void)) case UpdateLayout(index: Int, layout: ListViewItemNodeLayout, apply: () -> (Signal<Void, NoError>?, () -> Void))

2
Display/ListViewItem.swift
View File

@ -34,7 +34,7 @@ public struct ListViewItemConfigureNodeFlags: OptionSet {
public protocol ListViewItem { public protocol ListViewItem {
func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, () -> Void)) -> Void) func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, () -> Void)) -> Void)
func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping () -> Void) -> Void) func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping () -> Void) -> Void)
var accessoryItem: ListViewAccessoryItem? { get } var accessoryItem: ListViewAccessoryItem? { get }
var headerAccessoryItem: ListViewAccessoryItem? { get } var headerAccessoryItem: ListViewAccessoryItem? { get }

16
Display/NativeWindowHostView.swift
View File

@ -92,14 +92,20 @@ private final class NativeWindow: UIWindow, WindowHost {
var cancelInteractiveKeyboardGesturesImpl: (() -> Void)? var cancelInteractiveKeyboardGesturesImpl: (() -> Void)?
var forEachControllerImpl: (((ViewController) -> Void) -> Void)? var forEachControllerImpl: (((ViewController) -> Void) -> Void)?
private var frameTransition: ContainedViewLayoutTransition?
override var frame: CGRect { override var frame: CGRect {
get { get {
return super.frame return super.frame
} set(value) { } set(value) {
let sizeUpdated = super.frame.size != value.size let sizeUpdated = super.frame.size != value.size
if sizeUpdated, let transition = self.frameTransition, case let .animated(duration, curve) = transition {
var frameTransition: ContainedViewLayoutTransition = .immediate
if #available(iOSApplicationExtension 9.0, *) {
let duration = UIView.inheritedAnimationDuration
if !duration.isZero {
frameTransition = .animated(duration: duration, curve: .easeInOut)
}
}
if sizeUpdated, case let .animated(duration, curve) = frameTransition {
let previousFrame = super.frame let previousFrame = super.frame
super.frame = value super.frame = value
self.layer.animateFrame(from: previousFrame, to: value, duration: duration, timingFunction: curve.timingFunction) self.layer.animateFrame(from: previousFrame, to: value, duration: duration, timingFunction: curve.timingFunction)
@ -149,11 +155,7 @@ private final class NativeWindow: UIWindow, WindowHost {
override func _update(toInterfaceOrientation arg1: Int32, duration arg2: Double, force arg3: Bool) { override func _update(toInterfaceOrientation arg1: Int32, duration arg2: Double, force arg3: Bool) {
self.updateIsUpdatingOrientationLayout?(true) self.updateIsUpdatingOrientationLayout?(true)
if !arg2.isZero {
self.frameTransition = .animated(duration: arg2, curve: .easeInOut)
}
super._update(toInterfaceOrientation: arg1, duration: arg2, force: arg3) super._update(toInterfaceOrientation: arg1, duration: arg2, force: arg3)
self.frameTransition = nil
self.updateIsUpdatingOrientationLayout?(false) self.updateIsUpdatingOrientationLayout?(false)
self.updateToInterfaceOrientation?() self.updateToInterfaceOrientation?()