marinofaggiana il y a 6 ans
Parent
commit
d9700e3849

+ 2 - 2
iOSClient/Media/NCMedia.swift

@@ -370,7 +370,7 @@ extension NCMedia: UIViewControllerPreviewingDelegate {
         
         previewingContext.sourceRect = cell.frame
         viewController.metadata = metadata
-        viewController.hideOpenIn = true
+        viewController.hideAction = true
         
         return viewController
     }
@@ -750,7 +750,7 @@ extension NCMedia: FastScrollCollectionViewDelegate {
         
         //scrollbar
         collectionView.scrollbarWidth = 0.0
-        collectionView.scrollbarMarginTop = 45.0
+        collectionView.scrollbarMarginTop = 43.0
         collectionView.scrollbarMarginBottom = 5.0
         collectionView.scrollbarMarginRight = 10.0
         

+ 1 - 1
iOSClient/PeekPop/CCPeekPop.h

@@ -29,7 +29,7 @@
 @interface CCPeekPop : UIViewController
 
 @property (nonatomic, strong) tableMetadata *metadata;
-@property BOOL hideOpenIn;
+@property BOOL hideAction;
 
 @property (nonatomic, weak) IBOutlet UILabel *fileName;
 @property (nonatomic, weak) IBOutlet UIImageView *imagePreview;

+ 8 - 3
iOSClient/PeekPop/CCPeekPop.m

@@ -102,11 +102,11 @@
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems
 {
-    if (self.hideOpenIn) {
+    if (self.hideAction) {
         return @[];
     }
     
-    UIPreviewAction *previewAction1 = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_open_in_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController){
+    UIPreviewAction *openIn = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_open_in_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController){
         
         self.metadata.session = k_download_session;
         self.metadata.sessionError = @"";
@@ -118,7 +118,12 @@
         [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
     }];
     
-    return @[previewAction1];
+    UIPreviewAction *share = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_share_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController){
+        
+        [appDelegate.activeMain readShareWithAccount:appDelegate.activeAccount openWindow:YES metadata:self.metadata];
+    }];
+    
+    return @[openIn, share];
 }
 
 #pragma --------------------------------------------------------------------------------------------