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

Video avatar fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2020-06-24 18:06:08 +03:00
parent 4755ee4261
commit a34b7402be
62 changed files with 753 additions and 1962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,12 +72,12 @@
UIImage *_thumbnailImage;
AVPlayerItem *_playerItem;
AVPlayer *_player;
SMetaDisposable *_playerItemDisposable;
id _playerStartedObserver;
id _playerReachedEndObserver;
bool _registeredKeypathObserver;
NSTimer *_positionTimer;
bool _scheduledVideoPlayback;
id<TGMediaEditAdjustments> _initialAdjustments;
NSString *_caption;
@@ -260,14 +260,6 @@
TGPhotoEditorBackButton backButton = TGPhotoEditorBackButtonCancel;
if ([self presentedForAvatarCreation])
{
if ([self presentedFromCamera])
backButton = TGPhotoEditorBackButtonCancel;
else
backButton = TGPhotoEditorBackButtonCancel;
}
TGPhotoEditorDoneButton doneButton = TGPhotoEditorDoneButtonCheck;
_portraitToolbarView = [[TGPhotoToolbarView alloc] initWithBackButton:backButton doneButton:doneButton solidBackground:true];
[_portraitToolbarView setToolbarTabs:_availableTabs animated:false];
@@ -403,8 +395,11 @@
[signal startWithNext:^(id next)
{
CGFloat progress = 0.0;
bool progressVisible = false;
if ([next isKindOfClass:[UIImage class]]) {
[_photoEditor setImage:(UIImage *)next forCropRect:_photoEditor.cropRect cropRotation:_photoEditor.cropRotation cropOrientation:_photoEditor.cropOrientation cropMirrored:_photoEditor.cropMirrored fullSize:false];
progress = 1.0f;
} else if ([next isKindOfClass:[AVAsset class]]) {
_playerItem = [AVPlayerItem playerItemWithAsset:(AVAsset *)next];
_player = [AVPlayer playerWithPlayerItem:_playerItem];
@@ -421,9 +416,22 @@
[_previewView performTransitionInWithCompletion:^
{
}];
if (_scheduledVideoPlayback) {
_scheduledVideoPlayback = false;
[self startVideoPlayback:true];
}
});
progress = 1.0f;
} else if ([next isKindOfClass:[NSNumber class]]) {
progress = [next floatValue];
progressVisible = true;
}
TGDispatchOnMainThread(^{
[self setProgressVisible:progressVisible value:progress animated:true];
});
if (_ignoreDefaultPreviewViewTransitionIn)
{
TGDispatchOnMainThread(^
@@ -496,6 +504,11 @@
}
- (void)startVideoPlayback:(bool)reset {
if (reset && _player == nil) {
_scheduledVideoPlayback = true;
return;
}
if (reset) {
NSTimeInterval startPosition = 0.0f;
if (_photoEditor.trimStartValue > DBL_EPSILON)
@@ -973,6 +986,9 @@
_switchingTab = true;
TGPhotoEditorBackButton backButtonType = TGPhotoEditorBackButtonCancel;
TGPhotoEditorDoneButton doneButtonType = TGPhotoEditorDoneButtonCheck;
__weak TGPhotoEditorController *weakSelf = self;
TGPhotoEditorTabController *controller = nil;
switch (tab)
@@ -1016,7 +1032,7 @@
strongSelf->_switchingTab = false;
[strongSelf startVideoPlayback:true];
};
controller = paintController;
}
break;
@@ -1358,6 +1374,8 @@
[strongSelf setVideoEndTime:endTime];
};
controller = previewController;
doneButtonType = TGPhotoEditorDoneButtonDone;
}
break;
@@ -1365,6 +1383,10 @@
break;
}
if (_intent == TGPhotoEditorControllerAvatarIntent && !isInitialAppearance && tab != TGPhotoEditorPreviewTab) {
backButtonType = TGPhotoEditorBackButtonBack;
}
_currentTabController = controller;
_currentTabController.item = _item;
_currentTabController.intent = _intent;
@@ -1381,12 +1403,12 @@
if (currentController != nil)
[_currentTabController viewWillAppear:true];
_currentTabController.view.frame = _containerView.bounds;
if (currentController != nil)
[_currentTabController viewDidAppear:true];
_currentTabController.view.frame = _containerView.bounds;
_currentTabController.valuesChanged = ^
{
__strong TGPhotoEditorController *strongSelf = weakSelf;
@@ -1405,6 +1427,12 @@
[_portraitToolbarView setToolbarTabs:[_currentTabController availableTabs] animated:true];
[_landscapeToolbarView setToolbarTabs:[_currentTabController availableTabs] animated:true];
[_portraitToolbarView setBackButtonType:backButtonType];
[_landscapeToolbarView setBackButtonType:backButtonType];
[_portraitToolbarView setDoneButtonType:doneButtonType];
[_landscapeToolbarView setDoneButtonType:doneButtonType];
[self updateEditorButtons];
if ([self respondsToSelector:@selector(setNeedsUpdateOfScreenEdgesDeferringSystemGestures)])
@@ -1474,10 +1502,7 @@
- (void)dismissEditor
{
if ([_currentTabController isKindOfClass:[TGPhotoAvatarPreviewController class]]) {
[self presentEditorTab:TGPhotoEditorCropTab];
return;
} else if (![_currentTabController isKindOfClass:[TGPhotoAvatarCropController class]] && _intent == TGPhotoEditorControllerAvatarIntent) {
if ((![_currentTabController isKindOfClass:[TGPhotoAvatarPreviewController class]] && ![_currentTabController isKindOfClass:[TGPhotoAvatarCropController class]]) && _intent == TGPhotoEditorControllerAvatarIntent) {
[self presentEditorTab:TGPhotoEditorPreviewTab];
return;
}
@@ -1570,9 +1595,7 @@
- (void)doneButtonPressed
{
if ([_currentTabController isKindOfClass:[TGPhotoAvatarCropController class]]) {
[self presentEditorTab:TGPhotoEditorPreviewTab];
} else if (_intent == TGPhotoEditorControllerAvatarIntent && ![_currentTabController isKindOfClass:[TGPhotoAvatarPreviewController class]]) {
if (_intent == TGPhotoEditorControllerAvatarIntent && ![_currentTabController isKindOfClass:[TGPhotoAvatarPreviewController class]]) {
[self presentEditorTab:TGPhotoEditorPreviewTab];
} else {
[self applyEditor];
@@ -1895,7 +1918,7 @@
- (void)dismiss
{
if (self.overlayWindow != nil)
if (self.overlayWindow != nil || self.customDismissBlock != nil)
{
[super dismiss];
}