Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/MediaPasteboardUI/BUILD

@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "MediaPasteboardUI",
+    module_name = "MediaPasteboardUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AttachmentUI:AttachmentUI",
+        "//submodules/MediaPickerUI:MediaPickerUI",
+        "//submodules/AttachmentTextInputPanelNode",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/MediaPasteboardUI/Sources/MediaPasteboardScreen.swift

@@ -0,0 +1,31 @@
+import Foundation
+import UIKit
+import Display
+import SwiftSignalKit
+import TelegramPresentationData
+import TelegramCore
+import AttachmentUI
+import MediaPickerUI
+import AccountContext
+import LegacyComponents
+import AttachmentTextInputPanelNode
+
+public func mediaPasteboardScreen(
+    context: AccountContext,
+    updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)? = nil,
+    peer: EnginePeer,
+    subjects: [MediaPickerScreenImpl.Subject.Media],
+    presentMediaPicker: @escaping (_ subject: MediaPickerScreenImpl.Subject, _ saveEditedPhotos: Bool, _ bannedSendPhotos: (Int32, Bool)?, _ bannedSendVideos: (Int32, Bool)?, _ present: @escaping (MediaPickerScreenImpl, AttachmentMediaPickerContext?) -> Void) -> Void,
+    getSourceRect: (() -> CGRect?)? = nil,
+    makeEntityInputView: @escaping () -> AttachmentTextInputPanelInputView? = { return nil }
+) -> ViewController {
+    let controller = AttachmentController(context: context, updatedPresentationData: updatedPresentationData, style: .glass, chatLocation: .peer(id: peer.id), buttons: [.standalone], initialButton: .standalone, makeEntityInputView: makeEntityInputView)
+    controller.requestController = { _, present in
+        presentMediaPicker(.media(subjects), false, nil, nil, { mediaPicker, mediaPickerContext in
+            present(mediaPicker, mediaPickerContext)
+        })
+    }
+    controller.updateSelectionCount(subjects.count)
+    controller.getSourceRect = getSourceRect
+    return controller
+}