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

Custom contact photo improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-12-06 23:34:52 +04:00
parent 5788f4a1ac
commit 371e0f092b
4 changed files with 217 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
submodules/LegacyComponents/Sources/TGPhotoEditorController.m
View File

@@ -1114,12 +1114,13 @@
image = TGScaleImageToPixelSize(image, CGSizeMake(150.0, 150.0));
}
if (avatar && completion != nil) {
completion(image);
if (!saveOnly && didFinishEditing != nil) {
didFinishEditing(editorValues, image, thumbnailImage, true, ^{
if (avatar && completion != nil) {
completion(image);
}
});
}
if (!saveOnly && didFinishEditing != nil)
didFinishEditing(editorValues, image, thumbnailImage, true, ^{});
} error:^(__unused id error)
{
TGLegacyLog(@"renderedImageSignal error");
@@ -1985,7 +1986,11 @@
if (![_currentTabController isDismissAllowed])
return;
self.view.userInteractionEnabled = false;
bool forAvatar = [self presentedForAvatarCreation];
if (!forAvatar) {
self.view.userInteractionEnabled = false;
}
[_currentTabController prepareTransitionOutSaving:true];
bool saving = true;
@@ -2088,9 +2093,9 @@
TGDispatchOnMainThread(^{
if (self.didFinishEditingVideo != nil)
self.didFinishEditingVideo(asset, [adjustments editAdjustmentsWithPreset:preset videoStartValue:videoStartValue trimStartValue:trimStartValue trimEndValue:trimEndValue], fullImage, nil, true, ^{});
[self dismissAnimated:true];
self.didFinishEditingVideo(asset, [adjustments editAdjustmentsWithPreset:preset videoStartValue:videoStartValue trimStartValue:trimStartValue trimEndValue:trimEndValue], fullImage, nil, true, ^{
[self dismissAnimated:true];
});
});
}];
}];
@@ -2098,11 +2103,13 @@
}
else if (_intent != TGPhotoEditorControllerVideoIntent)
{
TGProgressWindow *progressWindow = [[TGProgressWindow alloc] init];
progressWindow.windowLevel = self.view.window.windowLevel + 0.001f;
[progressWindow performSelector:@selector(showAnimated) withObject:nil afterDelay:0.5];
TGProgressWindow *progressWindow;
if (!forAvatar) {
progressWindow = [[TGProgressWindow alloc] init];
progressWindow.windowLevel = self.view.window.windowLevel + 0.001f;
[progressWindow performSelector:@selector(showAnimated) withObject:nil afterDelay:0.5];
}
bool forAvatar = [self presentedForAvatarCreation];
[self createEditedImageWithEditorValues:adjustments createThumbnail:!forAvatar saveOnly:false completion:^(__unused UIImage *image)
{
[NSObject cancelPreviousPerformRequestsWithTarget:progressWindow selector:@selector(showAnimated) object:nil];