marinofaggiana 4 years ago
parent
commit
57886cf4a0

+ 20 - 20
iOSClient/Capabilities/NCCapabilitiesViewController.storyboard

@@ -57,9 +57,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SbT-rU-lJ8">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="Yf6-Er-ibu"/>
+                                                            <constraint firstAttribute="height" constant="25" id="Yf6-Er-ibu"/>
                                                             <constraint firstAttribute="width" constant="120" id="bqY-hB-VuU"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -96,10 +96,10 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ivv-te-kaP">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="120" id="KRE-Ez-UvG"/>
-                                                            <constraint firstAttribute="height" constant="20" id="xhy-Qg-h6R"/>
+                                                            <constraint firstAttribute="height" constant="25" id="xhy-Qg-h6R"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                         <nil key="textColor"/>
@@ -135,9 +135,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M82-8U-M4Q">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="L0G-30-siH"/>
+                                                            <constraint firstAttribute="height" constant="25" id="L0G-30-siH"/>
                                                             <constraint firstAttribute="width" constant="120" id="z0Z-Hz-edq"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -174,10 +174,10 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zZ2-UK-v5K">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="120" id="aKE-lB-GjU"/>
-                                                            <constraint firstAttribute="height" constant="20" id="gme-gx-kFL"/>
+                                                            <constraint firstAttribute="height" constant="25" id="gme-gx-kFL"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                         <nil key="textColor"/>
@@ -212,9 +212,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dyb-1O-dIA">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="C3a-Ec-xJv"/>
+                                                            <constraint firstAttribute="height" constant="25" id="C3a-Ec-xJv"/>
                                                             <constraint firstAttribute="width" constant="120" id="IB5-Hq-R4j"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -250,9 +250,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WAg-Hw-sQS">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="NEz-tu-8Rk"/>
+                                                            <constraint firstAttribute="height" constant="25" id="NEz-tu-8Rk"/>
                                                             <constraint firstAttribute="width" constant="120" id="zjs-JE-2aB"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -288,10 +288,10 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8hg-qK-qvz">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="120" id="Ns2-PG-H7R"/>
-                                                            <constraint firstAttribute="height" constant="20" id="b2x-qE-hf6"/>
+                                                            <constraint firstAttribute="height" constant="25" id="b2x-qE-hf6"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                         <nil key="textColor"/>
@@ -326,9 +326,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uiz-H8-p3D">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="Eqf-R1-eKB"/>
+                                                            <constraint firstAttribute="height" constant="25" id="Eqf-R1-eKB"/>
                                                             <constraint firstAttribute="width" constant="120" id="i0a-tu-JgU"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -364,9 +364,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="30w-oC-gZl">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="E6x-vP-Fs9"/>
+                                                            <constraint firstAttribute="height" constant="25" id="E6x-vP-Fs9"/>
                                                             <constraint firstAttribute="width" constant="120" id="nGc-gZ-jaG"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -402,9 +402,9 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ucV-YG-5ht">
-                                                        <rect key="frame" x="279" y="15" width="120" height="20"/>
+                                                        <rect key="frame" x="279" y="12.5" width="120" height="25"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="20" id="8Xe-4g-RxY"/>
+                                                            <constraint firstAttribute="height" constant="25" id="8Xe-4g-RxY"/>
                                                             <constraint firstAttribute="width" constant="120" id="m3G-CE-aso"/>
                                                         </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>

+ 11 - 11
iOSClient/Capabilities/NCCapabilitiesViewController.swift

@@ -76,7 +76,7 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
         textView.layer.cornerRadius = 15
         textView.backgroundColor = NCBrandColor.sharedInstance.graySoft
         
-        statusFileSharing.layer.cornerRadius = 10
+        statusFileSharing.layer.cornerRadius = 12.5
         statusFileSharing.layer.borderWidth = 0.5
         statusFileSharing.layer.borderColor = UIColor.black.cgColor
         statusFileSharing.layer.backgroundColor = NCBrandColor.sharedInstance.graySoft.withAlphaComponent(0.3).cgColor
@@ -204,13 +204,13 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
         textView.text = capabilitiesText
         
         if NCManageDatabase.sharedInstance.getCapabilitiesServerBool(account: account, elements: NCElementsJSON.shared.capabilitiesFileSharingApiEnabled, exists: false) {
-            statusFileSharing.text = NSLocalizedString("_available_", comment: "")
+            statusFileSharing.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusFileSharing.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         if NCManageDatabase.sharedInstance.getCapabilitiesServerBool(account: account, elements: NCElementsJSON.shared.capabilitiesExternalSitesExists, exists: false) {
-            statusExternalSite.text = NSLocalizedString("_available_", comment: "")
+            statusExternalSite.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusExternalSite.text = NSLocalizedString("_not_available_", comment: "")
         }
@@ -219,35 +219,35 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
         let versionE2EE = NCManageDatabase.sharedInstance.getCapabilitiesServerString(account: account, elements: NCElementsJSON.shared.capabilitiesE2EEApiVersion)
         
         if isE2EEEnabled && versionE2EE == k_E2EE_API {
-            statusEndToEndEncryption.text = NSLocalizedString("_available_", comment: "")
+            statusEndToEndEncryption.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusEndToEndEncryption.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         let paginationEndpoint = NCManageDatabase.sharedInstance.getCapabilitiesServerString(account: account, elements: NCElementsJSON.shared.capabilitiesPaginationEndpoint)
         if paginationEndpoint != nil {
-            statusPaginatedFileListing.text = NSLocalizedString("_available_", comment: "")
+            statusPaginatedFileListing.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusPaginatedFileListing.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         let activity = NCManageDatabase.sharedInstance.getCapabilitiesServerArray(account: account, elements: NCElementsJSON.shared.capabilitiesActivity)
         if activity != nil {
-            statusActivity.text = NSLocalizedString("_available_", comment: "")
+            statusActivity.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusActivity.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         let notification = NCManageDatabase.sharedInstance.getCapabilitiesServerArray(account: account, elements: NCElementsJSON.shared.capabilitiesNotification)
         if notification != nil {
-            statusNotification.text = NSLocalizedString("_available_", comment: "")
+            statusNotification.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusNotification.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         let deleteFiles = NCManageDatabase.sharedInstance.getCapabilitiesServerBool(account: account, elements: NCElementsJSON.shared.capabilitiesFilesUndelete, exists: false)
         if deleteFiles {
-            statusDeletedFiles.text = NSLocalizedString("_available_", comment: "")
+            statusDeletedFiles.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusDeletedFiles.text = NSLocalizedString("_not_available_", comment: "")
         }
@@ -265,20 +265,20 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
         }
         
         if textEditor {
-            statusText.text = NSLocalizedString("_available_", comment: "")
+            statusText.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusText.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         let richdocumentsMimetypes = NCManageDatabase.sharedInstance.getCapabilitiesServerArray(account: account, elements: NCElementsJSON.shared.capabilitiesRichdocumentsMimetypes)
         if richdocumentsMimetypes != nil {
-            statusCollabora.text = NSLocalizedString("_available_", comment: "")
+            statusCollabora.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusCollabora.text = NSLocalizedString("_not_available_", comment: "")
         }
         
         if onlyofficeEditors {
-            statusOnlyOffice.text = NSLocalizedString("_available_", comment: "")
+            statusOnlyOffice.text = "✓ " + NSLocalizedString("_available_", comment: "")
         } else {
             statusOnlyOffice.text = NSLocalizedString("_not_available_", comment: "")
         }