coding

Nextcloud.xcodeproj/project.pbxproj

@@ -47,8 +47,8 @@
 		F7063DF12199E56F003F38DA /* CocoaLumberjackSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7063DF02199E56E003F38DA /* CocoaLumberjackSwift.framework */; };
 		F707C26521A2DC5200F6181E /* NCStoreReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = F707C26421A2DC5200F6181E /* NCStoreReview.swift */; };
 		F70968A424212C4E00ED60E5 /* NCLivePhoto.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70968A324212C4E00ED60E5 /* NCLivePhoto.swift */; };
-		F70A58BE24D0349500DED00D /* NCDiagnosticViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70A58BD24D0349500DED00D /* NCDiagnosticViewController.swift */; };
-		F70A58C024D0545100DED00D /* NCDiagnosticViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F70A58BF24D0545100DED00D /* NCDiagnosticViewController.storyboard */; };
+		F70A58BE24D0349500DED00D /* NCCapabilitiesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70A58BD24D0349500DED00D /* NCCapabilitiesViewController.swift */; };
+		F70A58C024D0545100DED00D /* NCCapabilitiesViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F70A58BF24D0545100DED00D /* NCCapabilitiesViewController.storyboard */; };
 		F70BFC7420E0FA7D00C67599 /* NCUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70BFC7320E0FA7C00C67599 /* NCUtility.swift */; };
 		F70BFC7520E0FA7D00C67599 /* NCUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70BFC7320E0FA7C00C67599 /* NCUtility.swift */; };
 		F70CAE3A1F8CF31A008125FD /* NCEndToEndEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = F70CAE391F8CF31A008125FD /* NCEndToEndEncryption.m */; };
@@ -390,8 +390,8 @@
 		F707C26421A2DC5200F6181E /* NCStoreReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCStoreReview.swift; sourceTree = "<group>"; };
 		F70968A324212C4E00ED60E5 /* NCLivePhoto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCLivePhoto.swift; sourceTree = "<group>"; };
 		F70A07C8205285FB00DC1231 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		F70A58BD24D0349500DED00D /* NCDiagnosticViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCDiagnosticViewController.swift; sourceTree = "<group>"; };
-		F70A58BF24D0545100DED00D /* NCDiagnosticViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCDiagnosticViewController.storyboard; sourceTree = "<group>"; };
+		F70A58BD24D0349500DED00D /* NCCapabilitiesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCapabilitiesViewController.swift; sourceTree = "<group>"; };
+		F70A58BF24D0545100DED00D /* NCCapabilitiesViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCCapabilitiesViewController.storyboard; sourceTree = "<group>"; };
 		F70BFC7320E0FA7C00C67599 /* NCUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCUtility.swift; sourceTree = "<group>"; };
 		F70CAE381F8CF31A008125FD /* NCEndToEndEncryption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NCEndToEndEncryption.h; sourceTree = "<group>"; };
 		F70CAE391F8CF31A008125FD /* NCEndToEndEncryption.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NCEndToEndEncryption.m; sourceTree = "<group>"; };
@@ -958,8 +958,8 @@
 		F73FAEE224D2CA830090692E /* Diagnostics */ = {
 			isa = PBXGroup;
 			children = (
-				F70A58BF24D0545100DED00D /* NCDiagnosticViewController.storyboard */,
-				F70A58BD24D0349500DED00D /* NCDiagnosticViewController.swift */,
+				F70A58BF24D0545100DED00D /* NCCapabilitiesViewController.storyboard */,
+				F70A58BD24D0349500DED00D /* NCCapabilitiesViewController.swift */,
 			);
 			path = Diagnostics;
 			sourceTree = "<group>";
@@ -1809,7 +1809,7 @@
 				F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */,
 				F700510122DF63AC003A3356 /* NCShare.storyboard in Resources */,
 				F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */,
-				F70A58C024D0545100DED00D /* NCDiagnosticViewController.storyboard in Resources */,
+				F70A58C024D0545100DED00D /* NCCapabilitiesViewController.storyboard in Resources */,
 				F749C10D23C4A5340027D966 /* NCIntro.storyboard in Resources */,
 				F747BA1F22354D2000971601 /* NCCreateFormUploadVoiceNote.storyboard in Resources */,
 				F7B2DEF11F976859007CF4D2 /* english.txt in Resources */,
@@ -1984,7 +1984,7 @@
 				F7E09CE323E3088000FB3E9E /* NCMainRefreshControl.swift in Sources */,
 				F77B0DF41D118A16002130FE /* CCMain.m in Sources */,
 				F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */,
-				F70A58BE24D0349500DED00D /* NCDiagnosticViewController.swift in Sources */,
+				F70A58BE24D0349500DED00D /* NCCapabilitiesViewController.swift in Sources */,
 				370D26AF248A3D7A00121797 /* NCImageCellProtocol.swift in Sources */,
 				F7E9C41B20F4CA870040CF18 /* CCTransfers.m in Sources */,
 				37C83A0F24532BA600618A3B /* CCMain+Swift.swift in Sources */,

iOSClient/Diagnostics/NCDiagnosticViewController.storyboard → iOSClient/Diagnostics/NCCapabilitiesViewController.storyboard

@@ -8,10 +8,10 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Diagnostic View Controller-->
+        <!--Capabilities View Controller-->
         <scene sceneID="UF0-FW-gHK">
             <objects>
-                <viewController id="7oH-vf-YqN" customClass="NCDiagnosticViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="7oH-vf-YqN" customClass="NCCapabilitiesViewController" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Aja-Mn-6Wc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -493,43 +493,21 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OO4-N7-9vp" userLabel="View JSON">
-                                        <rect key="frame" x="0.0" y="600" width="414" height="78"/>
+                                        <rect key="frame" x="0.0" y="600" width="414" height="43"/>
                                         <subviews>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="RIO-6X-GG1">
-                                                <rect key="frame" x="5" y="40" width="404" height="33"/>
+                                                <rect key="frame" x="5" y="5" width="404" height="33"/>
                                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                             </textView>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hqP-sH-lSo">
-                                                <rect key="frame" x="5" y="10" width="404" height="18"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Xe-Ey-1EV">
-                                                <rect key="frame" x="379" y="0.0" width="30" height="30"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="30" id="Acu-l4-ixu"/>
-                                                    <constraint firstAttribute="width" constant="30" id="ZKn-V1-T2h"/>
-                                                </constraints>
-                                                <state key="normal" image="shareFill"/>
-                                                <connections>
-                                                    <action selector="actionShareCapabilities" destination="7oH-vf-YqN" eventType="touchUpInside" id="AyD-b9-7OZ"/>
-                                                </connections>
-                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                         <constraints>
                                             <constraint firstItem="RIO-6X-GG1" firstAttribute="leading" secondItem="OO4-N7-9vp" secondAttribute="leading" constant="5" id="63w-yC-mGi"/>
-                                            <constraint firstItem="hqP-sH-lSo" firstAttribute="top" secondItem="OO4-N7-9vp" secondAttribute="top" constant="10" id="7tR-gf-nae"/>
                                             <constraint firstAttribute="trailing" secondItem="RIO-6X-GG1" secondAttribute="trailing" constant="5" id="9cj-M6-K3f"/>
-                                            <constraint firstItem="hqP-sH-lSo" firstAttribute="leading" secondItem="OO4-N7-9vp" secondAttribute="leading" constant="5" id="HXp-td-pyQ"/>
-                                            <constraint firstItem="RIO-6X-GG1" firstAttribute="top" secondItem="OO4-N7-9vp" secondAttribute="top" constant="40" id="ODH-TK-qMG"/>
-                                            <constraint firstAttribute="trailing" secondItem="9Xe-Ey-1EV" secondAttribute="trailing" constant="5" id="aCV-00-QrL"/>
+                                            <constraint firstItem="RIO-6X-GG1" firstAttribute="top" secondItem="OO4-N7-9vp" secondAttribute="top" constant="5" id="ODH-TK-qMG"/>
                                             <constraint firstAttribute="bottom" secondItem="RIO-6X-GG1" secondAttribute="bottom" constant="5" id="ajP-yK-idK"/>
-                                            <constraint firstAttribute="trailing" secondItem="hqP-sH-lSo" secondAttribute="trailing" constant="5" id="fLN-ek-dgd"/>
-                                            <constraint firstItem="9Xe-Ey-1EV" firstAttribute="top" secondItem="OO4-N7-9vp" secondAttribute="top" id="rMZ-jb-ncC"/>
                                         </constraints>
                                     </view>
                                 </subviews>
@@ -559,7 +537,6 @@
                     </view>
                     <navigationItem key="navigationItem" id="fnR-ht-Muv"/>
                     <connections>
-                        <outlet property="buttonShareCapabilities" destination="9Xe-Ey-1EV" id="BMQ-eI-ipD"/>
                         <outlet property="davFiles" destination="q89-9y-xvK" id="eHD-Ph-7x2"/>
                         <outlet property="davImage" destination="Tlp-7L-xxK" id="K25-ye-TED"/>
                         <outlet property="homeImage" destination="pyf-iS-YYP" id="gAh-bM-f5J"/>
@@ -585,7 +562,6 @@
                         <outlet property="statusPaginatedFileListing" destination="zZ2-UK-v5K" id="ocu-ZZ-Ydz"/>
                         <outlet property="statusText" destination="uiz-H8-p3D" id="wLb-D2-MNS"/>
                         <outlet property="textView" destination="RIO-6X-GG1" id="lPs-Ev-hQf"/>
-                        <outlet property="titleCapabilities" destination="hqP-sH-lSo" id="owK-UK-6Hb"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="0OV-l8-tBJ" sceneMemberID="firstResponder"/>
@@ -623,7 +599,6 @@
         <image name="notification" width="512" height="512"/>
         <image name="onlyoffice" width="425" height="425"/>
         <image name="share" width="512" height="512"/>
-        <image name="shareFill" width="512" height="512"/>
         <image name="text" width="425" height="425"/>
     </resources>
 </document>

iOSClient/Diagnostics/NCDiagnosticViewController.swift → iOSClient/Diagnostics/NCCapabilitiesViewController.swift

@@ -1,5 +1,5 @@
 //
-//  NCDiagnosticViewController.swift
+//  NCCapabilitiesViewController.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 28/07/2020.
@@ -24,7 +24,7 @@
 import UIKit
 import NCCommunication
 
-class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControllerDelegate {
+class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionControllerDelegate {
 
     @IBOutlet weak var textView: UITextView!
     
@@ -64,9 +64,6 @@ class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControl
     @IBOutlet weak var davImage: UIImageView!
     @IBOutlet weak var davFiles: UILabel!
     
-    @IBOutlet weak var titleCapabilities: UILabel!
-    @IBOutlet weak var buttonShareCapabilities: UIButton!
-    
     private let appDelegate = UIApplication.shared.delegate as! AppDelegate
     private var documentController: UIDocumentInteractionController?
     private var account: String = ""
@@ -76,8 +73,10 @@ class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControl
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.title = NSLocalizedString("_diagnostics_", comment: "")
+        self.title = NSLocalizedString("_capabilities_", comment: "")
                
+        let shareImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "shareFill"), width: 50, height: 50, color: .gray)
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: shareImage, style: UIBarButtonItem.Style.plain, target: self, action: #selector(share))
         self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: NSLocalizedString("_done_", comment: ""), style: UIBarButtonItem.Style.plain, target: self, action: #selector(close))
 
         textView.layer.cornerRadius = 15
@@ -163,8 +162,6 @@ class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControl
         
         davImage.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "dav"), width: 100, height: 100, color: .gray)
         davFiles.text = appDelegate.urlBase + "/" + NCUtility.shared.getDAV() + "/files/" + appDelegate.user + "/"
-        
-        titleCapabilities.text = NSLocalizedString("_capabilities_", comment: "")
     }
 
     @objc func updateCapabilities() {
@@ -202,7 +199,14 @@ class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControl
     }
     
     @objc func share() {
-       
+        //timer?.invalidate()
+        self.dismiss(animated: true) {
+            let fileURL = NSURL.fileURL(withPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent("capabilities.txt")
+            do {
+                try self.capabilitiesText.write(to: fileURL, atomically: true, encoding: .utf8)
+                NCMainCommon.sharedInstance.openIn(fileURL: fileURL, selector: nil)
+            } catch { }
+        }
     }
     
     @objc func close() {
@@ -296,15 +300,4 @@ class NCDiagnosticViewController: UIViewController, UIDocumentInteractionControl
         
         print("end.")
     }
-    
-    @IBAction func actionShareCapabilities() {
-        //timer?.invalidate()
-        self.dismiss(animated: true) {
-            let fileURL = NSURL.fileURL(withPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent("capabilities.txt")
-            do {
-                try self.capabilitiesText.write(to: fileURL, atomically: true, encoding: .utf8)
-                NCMainCommon.sharedInstance.openIn(fileURL: fileURL, selector: nil)
-            } catch { }
-        }
-    }
 }

iOSClient/Settings/CCAdvanced.m

@@ -132,7 +132,7 @@
     section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_diagnostics_", nil)];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"diagnostics" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_diagnostics_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"capabilities" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_capabilities_", nil)];
     row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.sharedInstance.backgroundCell;
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:NCBrandColor.sharedInstance.textView forKey:@"textLabel.textColor"];
@@ -142,8 +142,8 @@
                 
         [self deselectFormRow:sender];
         
-        NCDiagnosticViewController *diagnostic = [[UIStoryboard storyboardWithName:@"NCDiagnosticViewController" bundle:nil] instantiateInitialViewController];
-        [self presentViewController:diagnostic animated:YES completion:nil];
+        NCCapabilitiesViewController *capabilities = [[UIStoryboard storyboardWithName:@"NCCapabilitiesViewController" bundle:nil] instantiateInitialViewController];        
+        [self presentViewController:capabilities animated:YES completion:nil];
     };
     [section addFormRow:row];