ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 01:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-05-25 16:37:55 +02:00
parent bf15144237
commit ce3af41ebe
7 changed files with 88 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/LegacyComponents/Sources/TGCameraController.m
View File

@ -2852,6 +2852,8 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
} }
} }
bool isHighQualityPhoto = editingContext.isHighQualityPhoto;
if (storeAssets && !isScan) { if (storeAssets && !isScan) {
NSMutableArray *fullSizeSignals = [[NSMutableArray alloc] init]; NSMutableArray *fullSizeSignals = [[NSMutableArray alloc] init];
for (id<TGMediaEditableItem> item in selectedItems) for (id<TGMediaEditableItem> item in selectedItems)
@ -2968,7 +2970,9 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
id<TGMediaEditAdjustments> adjustments = [editingContext adjustmentsForItem:asset]; id<TGMediaEditAdjustments> adjustments = [editingContext adjustmentsForItem:asset];
NSNumber *timer = [editingContext timerForItem:asset]; NSNumber *timer = [editingContext timerForItem:asset];
SSignal *inlineSignal = [[asset screenImageSignal:0.0] map:^id(UIImage *originalImage)
SSignal *originalSignal = isHighQualityPhoto ? [asset originalImageSignal:0.0] : [asset screenImageSignal:0.0];
SSignal *inlineSignal = [originalSignal map:^id(UIImage *originalImage)
{ {
NSMutableDictionary *dict = [[NSMutableDictionary alloc] init]; NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
dict[@"type"] = @"editedPhoto"; dict[@"type"] = @"editedPhoto";
@ -2979,6 +2983,9 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
else if (groupedId != nil && !hasAnyTimers) else if (groupedId != nil && !hasAnyTimers)
dict[@"groupedId"] = groupedId; dict[@"groupedId"] = groupedId;
if (isHighQualityPhoto)
dict[@"hd"] = @true;
if (isScan) { if (isScan) {
if (caption != nil) if (caption != nil)
dict[@"caption"] = caption; dict[@"caption"] = caption;
@ -3058,6 +3065,9 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
else if (groupedId != nil && !hasAnyTimers) else if (groupedId != nil && !hasAnyTimers)
dict[@"groupedId"] = groupedId; dict[@"groupedId"] = groupedId;
if (isHighQualityPhoto)
dict[@"hd"] = @true;
if (isScan) { if (isScan) {
if (caption != nil) if (caption != nil)
dict[@"caption"] = caption; dict[@"caption"] = caption;

4
submodules/LegacyComponents/Sources/TGImageUtils.mm
View File

@ -231,6 +231,10 @@ UIImage *TGScaleAndBlurImage(NSData *data, __unused CGSize size, __autoreleasing
UIImage *TGScaleImageToPixelSize(UIImage *image, CGSize size) UIImage *TGScaleImageToPixelSize(UIImage *image, CGSize size)
{ {
if (image.size.width <= size.width && image.size.height <= size.height) {
return image;
}
UIGraphicsBeginImageContextWithOptions(size, true, 1.0f); UIGraphicsBeginImageContextWithOptions(size, true, 1.0f);
[image drawInRect:CGRectMake(0, 0, size.width, size.height) blendMode:kCGBlendModeCopy alpha:1.0f]; [image drawInRect:CGRectMake(0, 0, size.width, size.height) blendMode:kCGBlendModeCopy alpha:1.0f];
UIImage *result = UIGraphicsGetImageFromCurrentImageContext(); UIImage *result = UIGraphicsGetImageFromCurrentImageContext();

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

@ -1108,7 +1108,7 @@
TGPhotoEditorButton *qualityButton = [_portraitToolbarView buttonForTab:TGPhotoEditorQualityTab]; TGPhotoEditorButton *qualityButton = [_portraitToolbarView buttonForTab:TGPhotoEditorQualityTab];
if (qualityButton != nil) if (qualityButton != nil)
{ {
bool isPhoto = [_currentItemView isKindOfClass:[TGMediaPickerGalleryPhotoItemView class]]; bool isPhoto = [_currentItemView isKindOfClass:[TGMediaPickerGalleryPhotoItemView class]] || [_currentItem isKindOfClass:[TGCameraCapturedPhoto class]];
if (isPhoto) { if (isPhoto) {
bool isHd = _editingContext.isHighQualityPhoto; bool isHd = _editingContext.isHighQualityPhoto;
UIImage *icon = [TGPhotoEditorInterfaceAssets qualityIconForHighQuality:isHd filled: false]; UIImage *icon = [TGPhotoEditorInterfaceAssets qualityIconForHighQuality:isHd filled: false];

3
submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
View File

@ -197,7 +197,8 @@
__strong TGModernGalleryController *controller = strongSelf.controller; __strong TGModernGalleryController *controller = strongSelf.controller;
if ([controller.currentItem conformsToProtocol:@protocol(TGModernGalleryEditableItem)]) { if ([controller.currentItem conformsToProtocol:@protocol(TGModernGalleryEditableItem)]) {
if (tab == TGPhotoEditorQualityTab && [controller.currentItem isKindOfClass:[TGMediaPickerGalleryFetchResultItem class]] && [((TGMediaPickerGalleryFetchResultItem *)controller.currentItem).backingItem isKindOfClass:[TGMediaPickerGalleryPhotoItem class]]) { bool isPhoto = [controller.currentItem isKindOfClass:[TGMediaPickerGalleryPhotoItem class]] || ([controller.currentItem isKindOfClass:[TGMediaPickerGalleryFetchResultItem class]] && [((TGMediaPickerGalleryFetchResultItem *)controller.currentItem).backingItem isKindOfClass:[TGMediaPickerGalleryPhotoItem class]]);
if (tab == TGPhotoEditorQualityTab && isPhoto) {
[strongSelf->_editingContext setHighQualityPhoto:!strongSelf->_editingContext.isHighQualityPhoto]; [strongSelf->_editingContext setHighQualityPhoto:!strongSelf->_editingContext.isHighQualityPhoto];
[strongSelf->_interfaceView showPhotoQualityTooltip:strongSelf->_editingContext.isHighQualityPhoto]; [strongSelf->_interfaceView showPhotoQualityTooltip:strongSelf->_editingContext.isHighQualityPhoto];
} else { } else {

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

@ -6,7 +6,7 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#import <Accelerate/Accelerate.h> #import <Accelerate/Accelerate.h>
const CGSize TGPhotoEditorResultImageMaxSize = { 1280, 1280 }; const CGSize TGPhotoEditorResultImageMaxSize = { 2560, 2560 };
const CGSize TGPhotoEditorResultImageWallpaperMaxSize = { 2048, 2048 }; const CGSize TGPhotoEditorResultImageWallpaperMaxSize = { 2048, 2048 };
const CGSize TGPhotoEditorResultImageAvatarMaxSize = { 2048, 2048 }; const CGSize TGPhotoEditorResultImageAvatarMaxSize = { 2048, 2048 };
const CGSize TGPhotoEditorScreenImageHardLimitSize = { 1280, 1280 }; const CGSize TGPhotoEditorScreenImageHardLimitSize = { 1280, 1280 };

7
submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift
View File

@ -175,6 +175,7 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, NSAttributedString?, Str
let image = dict["image"] as! UIImage let image = dict["image"] as! UIImage
let thumbnail = dict["previewImage"] as? UIImage let thumbnail = dict["previewImage"] as? UIImage
let cover = dict["coverImage"] as? UIImage let cover = dict["coverImage"] as? UIImage
let forceHd = (dict["hd"] as? NSNumber)?.boolValue ?? false
var result: [AnyHashable : Any] = [:] var result: [AnyHashable : Any] = [:]
if let isAnimation = dict["isAnimation"] as? NSNumber, isAnimation.boolValue { if let isAnimation = dict["isAnimation"] as? NSNumber, isAnimation.boolValue {
@ -184,7 +185,7 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, NSAttributedString?, Str
result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: 4.0), thumbnail: thumbnail, cover: cover, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: false, asAnimation: true, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, spoiler: (dict["spoiler"] as? NSNumber)?.boolValue, price: price, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId) result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: 4.0), thumbnail: thumbnail, cover: cover, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: false, asAnimation: true, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, spoiler: (dict["spoiler"] as? NSNumber)?.boolValue, price: price, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
} }
} else { } else {
result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .image(image), thumbnail: thumbnail, caption: caption, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, spoiler: (dict["spoiler"] as? NSNumber)?.boolValue, price: price, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId) result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .image(image), thumbnail: thumbnail, caption: caption, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, spoiler: (dict["spoiler"] as? NSNumber)?.boolValue, price: price, forceHd: forceHd, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
} }
return result return result
} else if (dict["type"] as! NSString) == "cloudPhoto" { } else if (dict["type"] as! NSString) == "cloudPhoto" {
@ -400,7 +401,9 @@ public func legacyAssetPickerEnqueueMessages(context: AccountContext, account: A
var randomId: Int64 = 0 var randomId: Int64 = 0
arc4random_buf(&randomId, 8) arc4random_buf(&randomId, 8)
let tempFilePath = NSTemporaryDirectory() + "\(randomId).jpeg" let tempFilePath = NSTemporaryDirectory() + "\(randomId).jpeg"
let scaledSize = image.size.aspectFittedOrSmaller(CGSize(width: 1280.0, height: 1280.0)) let maxSize = item.forceHd ? CGSize(width: 2560.0, height: 2560.0) : CGSize(width: 1280.0, height: 1280.0)
let scaledSize = image.size.aspectFittedOrSmaller(maxSize)
if let scaledImage = TGScaleImageToPixelSize(image, scaledSize) { if let scaledImage = TGScaleImageToPixelSize(image, scaledSize) {
let tempFile = TempBox.shared.tempFile(fileName: "file") let tempFile = TempBox.shared.tempFile(fileName: "file")
defer { defer {

115
submodules/TelegramUI/Components/ShareExtensionContext/Sources/ShareExtensionContext.swift
View File

@ -596,58 +596,71 @@ public class ShareRootControllerImpl {
//inForeground.set(false) //inForeground.set(false)
self?.getExtensionContext()?.completeRequest(returningItems: nil, completionHandler: nil) self?.getExtensionContext()?.completeRequest(returningItems: nil, completionHandler: nil)
} }
shareController.shareStory = { [weak self] in
guard let self else { var canShareToStory = true
return if let inputItems = self?.getExtensionContext()?.inputItems, inputItems.count == 1, let item = inputItems[0] as? NSExtensionItem, let attachments = item.attachments {
} for attachment in attachments {
if attachment.hasItemConformingToTypeIdentifier(kUTTypeImage as String) {
if let inputItems = self.getExtensionContext()?.inputItems, inputItems.count == 1, let item = inputItems[0] as? NSExtensionItem, let attachments = item.attachments { } else if attachment.hasItemConformingToTypeIdentifier(kUTTypeMovie as String) {
let sessionId = Int64.random(in: 1000000 ..< .max) } else {
canShareToStory = false
let storiesPath = rootPath + "/share/stories/\(sessionId)"
let _ = try? FileManager.default.createDirectory(atPath: storiesPath, withIntermediateDirectories: true, attributes: nil)
var index = 0
let dispatchGroup = DispatchGroup()
for attachment in attachments {
let fileIndex = index
if attachment.hasItemConformingToTypeIdentifier(kUTTypeImage as String) {
dispatchGroup.enter()
attachment.loadFileRepresentation(forTypeIdentifier: kUTTypeImage as String, completionHandler: { url, _ in
if let url, let imageData = try? Data(contentsOf: url) {
let filePath = storiesPath + "/\(fileIndex).jpg"
try? FileManager.default.removeItem(atPath: filePath)
do {
try imageData.write(to: URL(fileURLWithPath: filePath))
} catch {
print("Error: \(error)")
}
}
dispatchGroup.leave()
})
} else if attachment.hasItemConformingToTypeIdentifier(kUTTypeMovie as String) {
dispatchGroup.enter()
attachment.loadFileRepresentation(forTypeIdentifier: kUTTypeMovie as String, completionHandler: { url, _ in
if let url {
let filePath = storiesPath + "/\(fileIndex).mp4"
try? FileManager.default.removeItem(atPath: filePath)
do {
try FileManager.default.copyItem(at: url, to: URL(fileURLWithPath: filePath))
} catch {
print("Error: \(error)")
}
}
dispatchGroup.leave()
})
}
index += 1
} }
}
dispatchGroup.notify(queue: .main) { }
self.openUrl("tg://shareStory?session=\(sessionId)")
if canShareToStory {
shareController.shareStory = { [weak self] in
guard let self else {
return
}
if let inputItems = self.getExtensionContext()?.inputItems, inputItems.count == 1, let item = inputItems[0] as? NSExtensionItem, let attachments = item.attachments {
let sessionId = Int64.random(in: 1000000 ..< .max)
let storiesPath = rootPath + "/share/stories/\(sessionId)"
let _ = try? FileManager.default.createDirectory(atPath: storiesPath, withIntermediateDirectories: true, attributes: nil)
var index = 0
let dispatchGroup = DispatchGroup()
for attachment in attachments {
let fileIndex = index
if attachment.hasItemConformingToTypeIdentifier(kUTTypeImage as String) {
dispatchGroup.enter()
attachment.loadFileRepresentation(forTypeIdentifier: kUTTypeImage as String, completionHandler: { url, _ in
if let url, let imageData = try? Data(contentsOf: url) {
let filePath = storiesPath + "/\(fileIndex).jpg"
try? FileManager.default.removeItem(atPath: filePath)
do {
try imageData.write(to: URL(fileURLWithPath: filePath))
} catch {
print("Error: \(error)")
}
}
dispatchGroup.leave()
})
} else if attachment.hasItemConformingToTypeIdentifier(kUTTypeMovie as String) {
dispatchGroup.enter()
attachment.loadFileRepresentation(forTypeIdentifier: kUTTypeMovie as String, completionHandler: { url, _ in
if let url {
let filePath = storiesPath + "/\(fileIndex).mp4"
try? FileManager.default.removeItem(atPath: filePath)
do {
try FileManager.default.copyItem(at: url, to: URL(fileURLWithPath: filePath))
} catch {
print("Error: \(error)")
}
}
dispatchGroup.leave()
})
}
index += 1
}
dispatchGroup.notify(queue: .main) {
self.openUrl("tg://shareStory?session=\(sessionId)")
}
} }
} }
} }