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

Attachment menu improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-02-22 00:42:24 +03:00
parent 501542da60
commit 33f503c41e
3 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.m
View File

@@ -173,8 +173,10 @@
groupSignal = [SSignal single:_assetGroup]; groupSignal = [SSignal single:_assetGroup];
} else { } else {
groupSignal = [_assetsLibrary cameraRollGroup]; groupSignal = [_assetsLibrary cameraRollGroup];
if (_intent == TGMediaAssetsControllerSendMediaIntent) {
reversed = true; reversed = true;
} }
}
__weak TGMediaAssetsPickerController *weakSelf = self; __weak TGMediaAssetsPickerController *weakSelf = self;
[_assetsDisposable setDisposable:[[[[groupSignal deliverOn:[SQueue mainQueue]] mapToSignal:^SSignal *(TGMediaAssetGroup *assetGroup) [_assetsDisposable setDisposable:[[[[groupSignal deliverOn:[SQueue mainQueue]] mapToSignal:^SSignal *(TGMediaAssetGroup *assetGroup)

3
submodules/MediaPickerUI/Sources/FetchAssets.swift
View File

@@ -4,6 +4,7 @@ import Photos
import SwiftSignalKit import SwiftSignalKit
private let imageManager = PHCachingImageManager() private let imageManager = PHCachingImageManager()
private let assetsQueue = Queue()
func assetImage(fetchResult: PHFetchResult<PHAsset>, index: Int, targetSize: CGSize, exact: Bool) -> Signal<UIImage?, NoError> { func assetImage(fetchResult: PHFetchResult<PHAsset>, index: Int, targetSize: CGSize, exact: Bool) -> Signal<UIImage?, NoError> {
let asset = fetchResult[index] let asset = fetchResult[index]
@@ -36,9 +37,11 @@ func assetImage(asset: PHAsset, targetSize: CGSize, exact: Bool) -> Signal<UIIma
} }
} }
return ActionDisposable { return ActionDisposable {
assetsQueue.async {
imageManager.cancelImageRequest(token) imageManager.cancelImageRequest(token)
} }
} }
} |> runOn(assetsQueue)
} }
func assetVideo(fetchResult: PHFetchResult<PHAsset>, index: Int) -> Signal<AVAsset?, NoError> { func assetVideo(fetchResult: PHFetchResult<PHAsset>, index: Int) -> Signal<AVAsset?, NoError> {

55
submodules/MediaPickerUI/Sources/MediaPickerScreen.swift
View File

@@ -423,7 +423,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
private var placeholderNode: MediaPickerPlaceholderNode? private var placeholderNode: MediaPickerPlaceholderNode?
private var manageNode: MediaPickerManageNode? private var manageNode: MediaPickerManageNode?
private let selectionNode: MediaPickerSelectedListNode private var selectionNode: MediaPickerSelectedListNode?
private var nextStableId: Int = 1 private var nextStableId: Int = 1
private var currentEntries: [MediaPickerGridEntry] = [] private var currentEntries: [MediaPickerGridEntry] = []
@@ -454,16 +454,11 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
self.gridNode = GridNode() self.gridNode = GridNode()
self.selectionNode = MediaPickerSelectedListNode(context: controller.context)
self.selectionNode.alpha = 0.0
self.selectionNode.isUserInteractionEnabled = false
super.init() super.init()
self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor
self.addSubnode(self.gridNode) self.addSubnode(self.gridNode)
self.addSubnode(self.selectionNode)
self.interaction = MediaPickerInteraction(openMedia: { [weak self] fetchResult, index, immediateThumbnail in self.interaction = MediaPickerInteraction(openMedia: { [weak self] fetchResult, index, immediateThumbnail in
self?.openMedia(fetchResult: fetchResult, index: index, immediateThumbnail: immediateThumbnail) self?.openMedia(fetchResult: fetchResult, index: index, immediateThumbnail: immediateThumbnail)
@@ -526,7 +521,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
} }
strongSelf.selectionNode.updateHiddenMedia() strongSelf.selectionNode?.updateHiddenMedia()
} }
}) })
@@ -569,8 +564,6 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
}) })
} }
self.selectionNode.interaction = self.interaction
} }
deinit { deinit {
@@ -669,7 +662,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
itemNode.updateSelectionState() itemNode.updateSelectionState()
} }
} }
self.selectionNode.updateSelectionState() self.selectionNode?.updateSelectionState()
let count = Int32(self.interaction?.selectionState?.count() ?? 0) let count = Int32(self.interaction?.selectionState?.count() ?? 0)
self.controller?.updateSelectionState(count: count) self.controller?.updateSelectionState(count: count)
@@ -689,17 +682,33 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
func updateMode(_ displayMode: DisplayMode) { func updateMode(_ displayMode: DisplayMode) {
self.currentDisplayMode = displayMode self.currentDisplayMode = displayMode
if case .selected = displayMode, self.selectionNode == nil, let controller = self.controller {
let selectionNode = MediaPickerSelectedListNode(context: controller.context)
selectionNode.alpha = 0.0
selectionNode.isUserInteractionEnabled = false
selectionNode.interaction = self.interaction
self.insertSubnode(selectionNode, aboveSubnode: self.gridNode)
self.selectionNode = selectionNode
if let (layout, navigationBarHeight) = self.validLayout {
self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
}
}
let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut) let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
self.gridNode.isUserInteractionEnabled = displayMode == .all self.gridNode.isUserInteractionEnabled = displayMode == .all
transition.updateAlpha(node: self.selectionNode, alpha: displayMode == .selected ? 1.0 : 0.0) if let selectionNode = self.selectionNode {
self.selectionNode.isUserInteractionEnabled = displayMode == .selected transition.updateAlpha(node: selectionNode, alpha: displayMode == .selected ? 1.0 : 0.0)
selectionNode.isUserInteractionEnabled = displayMode == .selected
}
} }
private func openMedia(fetchResult: PHFetchResult<PHAsset>, index: Int, immediateThumbnail: UIImage?) { private func openMedia(fetchResult: PHFetchResult<PHAsset>, index: Int, immediateThumbnail: UIImage?) {
guard let controller = self.controller, let interaction = self.interaction, let (layout, _) = self.validLayout else { guard let controller = self.controller, let interaction = self.interaction, let (layout, _) = self.validLayout else {
return return
} }
self.dismissInput()
let index = fetchResult.count - index - 1 let index = fetchResult.count - index - 1
presentLegacyMediaPickerGallery(context: controller.context, peer: controller.peer, chatLocation: controller.chatLocation, presentationData: self.presentationData, source: .fetchResult(fetchResult: fetchResult, index: index), immediateThumbnail: immediateThumbnail, selectionContext: interaction.selectionState, editingContext: interaction.editingState, hasSilentPosting: true, hasSchedule: true, hasTimer: true, updateHiddenMedia: { [weak self] id in presentLegacyMediaPickerGallery(context: controller.context, peer: controller.peer, chatLocation: controller.chatLocation, presentationData: self.presentationData, source: .fetchResult(fetchResult: fetchResult, index: index), immediateThumbnail: immediateThumbnail, selectionContext: interaction.selectionState, editingContext: interaction.editingState, hasSilentPosting: true, hasSchedule: true, hasTimer: true, updateHiddenMedia: { [weak self] id in
@@ -721,10 +730,12 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
guard let controller = self.controller, let interaction = self.interaction, let (layout, _) = self.validLayout else { guard let controller = self.controller, let interaction = self.interaction, let (layout, _) = self.validLayout else {
return return
} }
self.dismissInput()
presentLegacyMediaPickerGallery(context: controller.context, peer: controller.peer, chatLocation: controller.chatLocation, presentationData: self.presentationData, source: .selection(item: item), immediateThumbnail: immediateThumbnail, selectionContext: interaction.selectionState, editingContext: interaction.editingState, hasSilentPosting: true, hasSchedule: true, hasTimer: true, updateHiddenMedia: { [weak self] id in presentLegacyMediaPickerGallery(context: controller.context, peer: controller.peer, chatLocation: controller.chatLocation, presentationData: self.presentationData, source: .selection(item: item), immediateThumbnail: immediateThumbnail, selectionContext: interaction.selectionState, editingContext: interaction.editingState, hasSilentPosting: true, hasSchedule: true, hasTimer: true, updateHiddenMedia: { [weak self] id in
self?.hiddenMediaId.set(.single(id)) self?.hiddenMediaId.set(.single(id))
}, initialLayout: layout, transitionHostView: { [weak self] in }, initialLayout: layout, transitionHostView: { [weak self] in
return self?.selectionNode.view return self?.selectionNode?.view
}, transitionView: { [weak self] identifier in }, transitionView: { [weak self] identifier in
return self?.transitionView(for: identifier) return self?.transitionView(for: identifier)
}, completed: { [weak self] result, silently, scheduleTime in }, completed: { [weak self] result, silently, scheduleTime in
@@ -769,8 +780,8 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
private func transitionView(for identifier: String) -> UIView? { private func transitionView(for identifier: String) -> UIView? {
if self.selectionNode.alpha > 0.0 { if let selectionNode = self.selectionNode, selectionNode.alpha > 0.0 {
return self.selectionNode.transitionView(for: identifier) return selectionNode.transitionView(for: identifier)
} else { } else {
var transitionNode: MediaPickerGridItemNode? var transitionNode: MediaPickerGridItemNode?
self.gridNode.forEachItemNode { itemNode in self.gridNode.forEachItemNode { itemNode in
@@ -799,8 +810,8 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
func scrollToTop(animated: Bool = false) { func scrollToTop(animated: Bool = false) {
if self.selectionNode.alpha > 0.0 { if let selectionNode = self.selectionNode, selectionNode.alpha > 0.0 {
self.selectionNode.scrollToTop(animated: animated) selectionNode.scrollToTop(animated: animated)
} else { } else {
self.gridNode.scrollView.setContentOffset(CGPoint(x: 0.0, y: -self.gridNode.scrollView.contentInset.top), animated: animated) self.gridNode.scrollView.setContentOffset(CGPoint(x: 0.0, y: -self.gridNode.scrollView.contentInset.top), animated: animated)
} }
@@ -889,7 +900,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
guard let strongSelf = self else { guard let strongSelf = self else {
return return
} }
if !strongSelf.didSetReady { if !strongSelf.didSetReady && strongSelf.state != nil {
strongSelf.didSetReady = true strongSelf.didSetReady = true
Queue.mainQueue().justDispatch { Queue.mainQueue().justDispatch {
strongSelf._ready.set(.single(true)) strongSelf._ready.set(.single(true))
@@ -897,9 +908,10 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
}) })
if let selectionNode = self.selectionNode {
let selectedItems = self.interaction?.selectionState?.selectedItems() as? [TGMediaSelectableItem] ?? [] let selectedItems = self.interaction?.selectionState?.selectedItems() as? [TGMediaSelectableItem] ?? []
let updateSelectionNode = { let updateSelectionNode = {
self.selectionNode.updateLayout(size: bounds.size, insets: cleanGridInsets, items: selectedItems, grouped: self.controller?.groupedValue ?? true, theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, bubbleCorners: self.presentationData.chatBubbleCorners, transition: transition) selectionNode.updateLayout(size: bounds.size, insets: cleanGridInsets, items: selectedItems, grouped: self.controller?.groupedValue ?? true, theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, bubbleCorners: self.presentationData.chatBubbleCorners, transition: transition)
} }
if selectedItems.count < 1 && self.currentDisplayMode == .selected { if selectedItems.count < 1 && self.currentDisplayMode == .selected {
@@ -908,7 +920,8 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} else { } else {
updateSelectionNode() updateSelectionNode()
} }
transition.updateFrame(node: self.selectionNode, frame: bounds) transition.updateFrame(node: selectionNode, frame: bounds)
}
if let cameraView = self.cameraView { if let cameraView = self.cameraView {
if let cameraRect = cameraRect { if let cameraRect = cameraRect {
@@ -937,7 +950,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
placeholderNode.cameraPressed = { [weak self] in placeholderNode.cameraPressed = { [weak self] in
self?.controller?.openCamera?(nil) self?.controller?.openCamera?(nil)
} }
self.insertSubnode(placeholderNode, aboveSubnode: self.selectionNode) self.insertSubnode(placeholderNode, aboveSubnode: self.gridNode)
self.placeholderNode = placeholderNode self.placeholderNode = placeholderNode
} }
placeholderNode.update(layout: layout, theme: self.presentationData.theme, strings: self.presentationData.strings, hasCamera: cameraAccess == .authorized, transition: transition) placeholderNode.update(layout: layout, theme: self.presentationData.theme, strings: self.presentationData.strings, hasCamera: cameraAccess == .authorized, transition: transition)