Merge branch 'beta'

This commit is contained in:
Ali
2019-12-20 21:05:50 +04:00
143 changed files with 667 additions and 492 deletions

View File

@@ -764,7 +764,7 @@ private final class StickerPackScreenNode: ViewControllerTracingNode {
}
}
public final class StickerPackScreen: ViewController {
public final class StickerPackScreenImpl: ViewController {
private let context: AccountContext
private let stickerPacks: [StickerPackReference]
private let initialSelectedStickerPackIndex: Int
@@ -841,3 +841,9 @@ public final class StickerPackScreen: ViewController {
self.controllerNode.containerLayoutUpdated(layout, transition: transition)
}
}
public func StickerPackScreen(context: AccountContext, mainStickerPack: StickerPackReference, stickerPacks: [StickerPackReference], parentNavigationController: NavigationController? = nil, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)? = nil) -> ViewController {
let controller = StickerPackPreviewController(context: context, stickerPack: mainStickerPack, mode: .default, parentNavigationController: parentNavigationController)
controller.sendSticker = sendSticker
return controller
}