Various Improvements

submodules/LegacyComponents/Sources/TGClipboardGalleryMixin.m

@@ -2,6 +2,8 @@
 
 #import <LegacyComponents/LegacyComponents.h>
 
+#import "LegacyComponentsInternal.h"
+
 #import <LegacyComponents/TGModernGalleryController.h>
 #import "TGClipboardGalleryPhotoItem.h"
 #import "TGClipboardGalleryModel.h"
@@ -15,6 +17,8 @@
 #import <LegacyComponents/TGMediaAssetMomentList.h>
 #import <LegacyComponents/TGMediaAssetMoment.h>
 
+#import "TGMediaPickerSendActionSheetController.h"
+
 @interface TGClipboardGalleryMixin ()
 {
     TGMediaEditingContext *_editingContext;
@@ -35,7 +39,7 @@
 
 @implementation TGClipboardGalleryMixin
 
-- (instancetype)initWithContext:(id<LegacyComponentsContext>)context image:(UIImage *)image images:(NSArray *)images parentController:(TGViewController *)parentController thumbnailImage:(UIImage *)thumbnailImage selectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext suggestionContext:(TGSuggestionContext *)suggestionContext stickersContext:(id<TGPhotoPaintStickersContext>)stickersContext hasCaptions:(bool)hasCaptions hasTimer:(bool)hasTimer recipientName:(NSString *)recipientName
+- (instancetype)initWithContext:(id<LegacyComponentsContext>)context image:(UIImage *)image images:(NSArray *)images parentController:(TGViewController *)parentController thumbnailImage:(UIImage *)thumbnailImage selectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext suggestionContext:(TGSuggestionContext *)suggestionContext stickersContext:(id<TGPhotoPaintStickersContext>)stickersContext hasCaptions:(bool)hasCaptions hasTimer:(bool)hasTimer hasSilentPosting:(bool)hasSilentPosting hasSchedule:(bool)hasSchedule reminder:(bool)reminder recipientName:(NSString *)recipientName
 {
     self = [super init];
     if (self != nil)
@@ -109,7 +113,96 @@
             strongSelf->_galleryModel.dismiss(true, false);
             
             if (strongSelf.completeWithItem != nil)
-                strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item);
+                strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item, false, 0);
+        };
+        
+        model.interfaceView.doneLongPressed = ^(id<TGModernGalleryItem> item) {
+            __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+            if (strongSelf == nil || !(hasSilentPosting || hasSchedule))
+                return;
+            
+            if (iosMajorVersion() >= 10) {
+                UIImpactFeedbackGenerator *generator = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleMedium];
+                [generator impactOccurred];
+            }
+            
+            bool effectiveHasSchedule = hasSchedule;
+            for (id item in strongSelf->_galleryModel.selectionContext.selectedItems)
+            {
+                if ([item isKindOfClass:[TGMediaAsset class]])
+                {
+                    if ([[strongSelf->_editingContext timerForItem:item] integerValue] > 0)
+                    {
+                        effectiveHasSchedule = false;
+                        break;
+                    }
+                }
+            }
+            
+            TGMediaPickerSendActionSheetController *controller = [[TGMediaPickerSendActionSheetController alloc] initWithContext:strongSelf->_context isDark:true sendButtonFrame:strongSelf.galleryModel.interfaceView.doneButtonFrame canSendSilently:hasSilentPosting canSchedule:effectiveHasSchedule reminder:reminder hasTimer:hasTimer];
+            controller.send = ^{
+                __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                if (strongSelf == nil)
+                    return;
+                
+                strongSelf->_galleryModel.dismiss(true, false);
+                
+                if (strongSelf.completeWithItem != nil)
+                    strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item, false, 0);
+            };
+            controller.sendSilently = ^{
+                __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                if (strongSelf == nil)
+                    return;
+                
+                strongSelf->_galleryModel.dismiss(true, false);
+                
+                if (strongSelf.completeWithItem != nil)
+                    strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item, true, 0);
+            };
+            controller.schedule = ^{
+                __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                if (strongSelf == nil)
+                    return;
+                
+                strongSelf.presentScheduleController(^(int32_t time) {
+                    __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                    if (strongSelf == nil)
+                        return;
+                    
+                    strongSelf->_galleryModel.dismiss(true, false);
+                    
+                    if (strongSelf.completeWithItem != nil)
+                        strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item, false, time);
+                });
+            };
+            controller.sendWithTimer = ^{
+                __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                if (strongSelf == nil)
+                    return;
+                
+                strongSelf.presentTimerController(^(int32_t time) {
+                    __strong TGClipboardGalleryMixin *strongSelf = weakSelf;
+                    if (strongSelf == nil)
+                        return;
+                    
+                    strongSelf->_galleryModel.dismiss(true, false);
+                    
+                    TGMediaEditingContext *editingContext = strongSelf->_editingContext;
+                    NSMutableArray *items = [strongSelf->_galleryModel.selectionContext.selectedItems mutableCopy];
+                    [items addObject:((TGClipboardGalleryPhotoItem *)item).image];
+                    
+                    for (id<TGMediaEditableItem> editableItem in items) {
+                        [editingContext setTimer:@(time) forItem:editableItem];
+                    }
+                    
+                    if (strongSelf.completeWithItem != nil)
+                        strongSelf.completeWithItem((TGClipboardGalleryPhotoItem *)item, false, 0);
+                });
+            };
+            
+            TGOverlayControllerWindow *controllerWindow = [[TGOverlayControllerWindow alloc] initWithManager:[strongSelf->_context makeOverlayWindowManager] parentController:strongSelf->_parentController contentController:controller];
+            controllerWindow.hidden = false;
         };
         
         modernGallery.model = model;

submodules/LegacyComponents/Sources/TGClipboardMenu.m

@@ -9,7 +9,7 @@
 
 @implementation TGClipboardMenu
 
-+ (TGMenuSheetController *)presentInParentController:(TGViewController *)parentController context:(id<LegacyComponentsContext>)context images:(NSArray *)images hasCaption:(bool)hasCaption hasTimer:(bool)hasTimer recipientName:(NSString *)recipientName suggestionContext:(TGSuggestionContext *)suggestionContext stickersContext:(id<TGPhotoPaintStickersContext>)stickersContext completed:(void (^)(TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id<TGMediaSelectableItem> currentItem))completed dismissed:(void (^)(void))dismissed sourceView:(UIView *)sourceView sourceRect:(CGRect (^)(void))sourceRect
++ (TGMenuSheetController *)presentInParentController:(TGViewController *)parentController context:(id<LegacyComponentsContext>)context images:(NSArray *)images hasCaption:(bool)hasCaption hasTimer:(bool)hasTimer hasSilentPosting:(bool)hasSilentPosting hasSchedule:(bool)hasSchedule reminder:(bool)reminder recipientName:(NSString *)recipientName suggestionContext:(TGSuggestionContext *)suggestionContext stickersContext:(id<TGPhotoPaintStickersContext>)stickersContext presentScheduleController:(void (^)(void(^)(int32_t)))presentScheduleController presentTimerController:(void (^)(void(^)(int32_t)))presentTimerController completed:(void (^)(TGMediaSelectionContext *selectionContext, TGMediaEditingContext *editingContext, id<TGMediaSelectableItem> currentItem, bool silentPosting, int32_t scheduleTime))completed dismissed:(void (^)(void))dismissed sourceView:(UIView *)sourceView sourceRect:(CGRect (^)(void))sourceRect
 {
     bool centered = false;
     if (sourceRect == nil)
@@ -46,11 +46,16 @@
     previewItem.parentController = parentController;
     previewItem.allowCaptions = hasCaption;
     previewItem.hasTimer = hasTimer;
+    previewItem.hasSilentPosting = hasSilentPosting;
+    previewItem.hasSchedule = hasSchedule;
+    previewItem.reminder = reminder;
     previewItem.recipientName = recipientName;
-    previewItem.sendPressed = ^(UIImage *currentItem)
+    previewItem.presentScheduleController = presentScheduleController;
+    previewItem.presentTimerController = presentTimerController;
+    previewItem.sendPressed = ^(UIImage *currentItem, bool silentPosting, int32_t scheduleTime)
     {
         __strong TGClipboardPreviewItemView *strongPreviewItem = weakPreviewItem;
-        completed(strongPreviewItem.selectionContext, strongPreviewItem.editingContext, currentItem);
+        completed(strongPreviewItem.selectionContext, strongPreviewItem.editingContext, currentItem, silentPosting, scheduleTime);
         
         __strong TGMenuSheetController *strongController = weakController;
         [strongController dismissAnimated:true];
@@ -68,7 +73,7 @@
     TGMenuSheetButtonItemView *sendItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:sendTitle type:TGMenuSheetButtonTypeSend fontSize:20.0 action:^
     {
         __strong TGClipboardPreviewItemView *strongPreviewItem = weakPreviewItem;
-        completed(strongPreviewItem.selectionContext, strongPreviewItem.editingContext, nil);
+        completed(strongPreviewItem.selectionContext, strongPreviewItem.editingContext, nil, false, 0);
         
         __strong TGMenuSheetController *strongController = weakController;
         [strongController dismissAnimated:true];

submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.h

@@ -14,13 +14,20 @@
 @property (nonatomic, assign) bool hasTimer;
 @property (nonatomic, strong) NSString *recipientName;
 
+@property (nonatomic, assign) bool hasSchedule;
+@property (nonatomic, assign) bool hasSilentPosting;
+@property (nonatomic, assign) bool reminder;
+
 @property (nonatomic, readonly) TGMediaSelectionContext *selectionContext;
 @property (nonatomic, readonly) TGMediaEditingContext *editingContext;
 @property (nonatomic, strong) TGSuggestionContext *suggestionContext;
 @property (nonatomic, strong) id<TGPhotoPaintStickersContext> stickersContext;
 
 @property (nonatomic, copy) void (^selectionChanged)(NSUInteger);
-@property (nonatomic, copy) void (^sendPressed)(UIImage *currentItem);
+@property (nonatomic, copy) void (^sendPressed)(UIImage *currentItem, bool silentPosting, int32_t scheduleTime);
+
+@property (nonatomic, copy) void (^presentScheduleController)(void (^)(int32_t));
+@property (nonatomic, copy) void (^presentTimerController)(void (^)(int32_t));
 
 - (instancetype)initWithContext:(id<LegacyComponentsContext>)context images:(NSArray *)images;
 

submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.m

@@ -248,12 +248,13 @@ const CGFloat TGClipboardPreviewEdgeInset = 8.0f;
         
         strongSelf->_galleryMixin = nil;
     };
+
     
-    mixin.completeWithItem = ^(TGClipboardGalleryPhotoItem *item)
+    mixin.completeWithItem = ^(TGClipboardGalleryPhotoItem *item, bool silentPosting, int32_t scheduleTime)
     {
         __strong TGClipboardPreviewItemView *strongSelf = weakSelf;
         if (strongSelf != nil && strongSelf.sendPressed != nil)
-            strongSelf.sendPressed(item.image);
+            strongSelf.sendPressed(item.image, silentPosting, scheduleTime);
     };
 }
 
@@ -266,7 +267,9 @@ const CGFloat TGClipboardPreviewEdgeInset = 8.0f;
     if ([cell isKindOfClass:[TGClipboardPreviewCell class]])
         thumbnailImage = cell.imageView.image;
     
-    TGClipboardGalleryMixin *mixin = [[TGClipboardGalleryMixin alloc] initWithContext:_context image:image images:_images parentController:self.parentController thumbnailImage:thumbnailImage selectionContext:_selectionContext editingContext:_editingContext suggestionContext:self.suggestionContext stickersContext:self.stickersContext hasCaptions:self.allowCaptions hasTimer:self.hasTimer recipientName:self.recipientName];
+    TGClipboardGalleryMixin *mixin = [[TGClipboardGalleryMixin alloc] initWithContext:_context image:image images:_images parentController:self.parentController thumbnailImage:thumbnailImage selectionContext:_selectionContext editingContext:_editingContext suggestionContext:self.suggestionContext stickersContext:self.stickersContext hasCaptions:self.allowCaptions hasTimer:self.hasTimer hasSilentPosting:self.hasSilentPosting hasSchedule:self.hasSchedule reminder:self.reminder recipientName:self.recipientName];
+    mixin.presentScheduleController = self.presentScheduleController;
+    mixin.presentTimerController = self.presentTimerController;
     
     [self _setupGalleryMixin:mixin];
     

submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m

@@ -138,7 +138,9 @@
             if (strongSelf == nil)
                 return;
             
-            [strongSelf.window endEditing:true];    
+            [strongSelf.window endEditing:true];
+            strongSelf->_portraitToolbarView.doneButton.userInteractionEnabled = false;
+            strongSelf->_landscapeToolbarView.doneButton.userInteractionEnabled = false;
             strongSelf->_donePressed(strongSelf->_currentItem);
         };
         void(^toolbarDoneLongPressed)(id) = ^(id sender)
@@ -591,6 +593,8 @@
     [_muteButton setImage:muteIcon forState:UIControlStateNormal];
     [_muteButton setImage:muteActiveIcon forState:UIControlStateSelected];
     [_muteButton setImage:muteActiveIcon forState:UIControlStateSelected | UIControlStateHighlighted];
+    
+    [self setNeedsLayout];
 }
 
 - (TGPhotoEditorTab)currentTabs