marinofaggiana 4 жил өмнө
parent
commit
4f6876a6f2

+ 15 - 0
iOSClient/Images.xcassets/viewInFolder.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "viewInFolder.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

+ 53 - 0
iOSClient/Images.xcassets/viewInFolder.imageset/viewInFolder.pdf

@@ -0,0 +1,53 @@
+%PDF-1.4
+%Óëéá
+1 0 obj
+<</Creator (Mozilla/5.0 \(Macintosh; Intel Mac OS X 10_15_6\) AppleWebKit/537.36 \(KHTML, like Gecko\) BoxySVG/3.42.2 Chrome/83.0.4103.122 Electron/9.1.2 Safari/537.36)
+/Producer (Skia/PDF m83)
+/CreationDate (D:20200807134817+00'00')
+/ModDate (D:20200807134817+00'00')>>
+endobj
+3 0 obj
+<</ca 1
+/BM /Normal>>
+endobj
+4 0 obj
+<</Filter /FlateDecode
+/Length 235>> stream
+xœuP»nÃ0Üùœ„åC2¥/èÜ©`4É�hûÿ@I9Få¡`ñŽGòhRëã Ç=Ñ‹Vâ€
×;|AæÅ�©™Ù}ÂÇ>B!â¤"‹–Ñ,!kuéx	uSeE'WsÖžm_ß/? ïù8µ…ãÞ@”\°Rõd4˜NQÖ#p\hF[
+™Š¥ÆÐRqƒFR6b4ªã¹BB�I�ÂË^©üþE1¸ñ>sÿñ±’§Oº`£>`Ýà±*°Qñ§¹)<­›•EJut.8ØYa÷ûQ-8J6.³ÏÅóœá=î/GÍa
+endstream
+endobj
+2 0 obj
+<</Type /Page
+/Resources <</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/ExtGState <</G3 3 0 R>>>>
+/MediaBox [0 0 425.03998 425.03998]
+/Contents 4 0 R
+/StructParents 0
+/Parent 5 0 R>>
+endobj
+5 0 obj
+<</Type /Pages
+/Count 1
+/Kids [2 0 R]>>
+endobj
+6 0 obj
+<</Type /Catalog
+/Pages 5 0 R>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000015 00000 n 
+0000000643 00000 n 
+0000000301 00000 n 
+0000000338 00000 n 
+0000000843 00000 n 
+0000000898 00000 n 
+trailer
+<</Size 7
+/Root 6 0 R
+/Info 1 0 R>>
+startxref
+945
+%%EOF

+ 4 - 2
iOSClient/Main/Main.storyboard

@@ -295,7 +295,7 @@
                         <segue destination="2JP-H5-EI3" kind="show" identifier="segueActivity" id="aVb-Aj-gSf"/>
                         <segue destination="yit-8P-Oea" kind="show" identifier="segueNotification" id="JSA-8l-ixD"/>
                         <segue destination="2L6-L3-iRl" kind="show" identifier="segueTransfers" id="oIQ-Yx-Gmt"/>
-                        <segue destination="zzk-gS-FKl" kind="showDetail" identifier="segueRecent" id="Snj-Bw-Ce2"/>
+                        <segue destination="zzk-gS-FKl" kind="show" identifier="segueRecent" id="Snj-Bw-Ce2"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="D7n-Z1-9wU" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -355,7 +355,9 @@
         <!--NCRecent.storyboard-->
         <scene sceneID="nO2-dy-n7J">
             <objects>
-                <viewControllerPlaceholder storyboardName="NCRecent" referencedIdentifier="NCRecent.storyboard" id="zzk-gS-FKl" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="NCRecent" referencedIdentifier="NCRecent.storyboard" id="zzk-gS-FKl" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="9Kb-01-l1b"/>
+                </viewControllerPlaceholder>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rsS-r1-oFg" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="10831" y="502"/>

+ 15 - 0
iOSClient/Main/Menu/NCCollectionViewCommon+Menu.swift

@@ -217,6 +217,21 @@ extension NCCollectionViewCommon {
             )
         }
         
+        //
+        // VIEW IN FOLDER
+        //
+        if layoutKey == k_layout_view_recent {
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_view_in_folder_", comment: ""),
+                    icon: CCGraphics.changeThemingColorImage(UIImage(named: "viewInFolder"), width: 50, height: 50, color: NCBrandColor.sharedInstance.icon),
+                    action: { menuAction in
+                        NCCollectionCommon.shared.openFileViewInFolder(serverUrl: metadata.serverUrl, fileName: metadata.fileName)
+                    }
+                )
+            )
+        }
+        
         //
         // DELETE
         //