marinofaggiana há 4 anos atrás
pai
commit
ed73089edb

+ 1 - 1
iOSClient/Account Request/NCAccountRequest.swift

@@ -1,5 +1,5 @@
 //
-//  NCRenameFile.swift
+//  NCAccountRequest.swift
 //  Nextcloud
 //
 //  Created by Marino Faggiana on 26/02/21.

+ 10 - 1
iOSClient/Extensions/UIImage+Extensions.swift

@@ -138,6 +138,15 @@ extension UIImage {
     }
     
     func imageColor(_ color: UIColor) -> UIImage {
-        return image(color: color, size: size.width)
+                
+        if #available(iOS 13.0, *) {
+            return self.withTintColor(color, renderingMode: .alwaysOriginal)
+        } else {
+            let format = imageRendererFormat
+            return UIGraphicsImageRenderer(size: size, format: format).image { _ in
+                color.set()
+                withRenderingMode(.alwaysTemplate).draw(at: .zero)
+            }
+        }
     }
 }

+ 0 - 0
iOSClient/Images.xcassets/load.imageset/Contents.json → iOSClient/Images.xcassets/arrow.left.arrow.right.imageset/Contents.json


+ 0 - 0
iOSClient/Images.xcassets/load.imageset/transfer.pdf → iOSClient/Images.xcassets/arrow.left.arrow.right.imageset/transfer.pdf


+ 0 - 0
iOSClient/Images.xcassets/recent.imageset/Contents.json → iOSClient/Images.xcassets/clock.arrow.circlepath.imageset/Contents.json


+ 0 - 0
iOSClient/Images.xcassets/recent.imageset/recent.pdf → iOSClient/Images.xcassets/clock.arrow.circlepath.imageset/recent.pdf


+ 4 - 4
iOSClient/Main/Colleaction Common/NCCollectionCommon.swift

@@ -98,16 +98,16 @@ class NCCollectionCommon: NSObject, NCSelectDelegate {
         var image: UIImage?
         
         if #available(iOS 13.0, *) {
-            image = UIImage(systemName: named)
+            image = UIImage(systemName: named)?.imageColor(color)
             if image == nil {
-                image = UIImage(named: named)
+                image = UIImage(named: named)?.image(color: color, size: size)
             }
         } else {
-            image = UIImage(named: named)
+            image = UIImage(named: named)?.image(color: color, size: size)
         }
         
         if image != nil {
-            return image!.image(color: color, size: size)
+            return image!
         }
         
         return  UIImage(named: "file")!.image(color: color, size: size)

+ 5 - 5
iOSClient/More/NCMore.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -18,11 +18,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="50" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="vQk-TA-f9i">
-                                <rect key="frame" x="0.0" y="88" width="414" height="643"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="780"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <inset key="separatorInset" minX="56" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="5bU-gg-892">
-                                    <rect key="frame" x="0.0" y="599" width="414" height="44"/>
+                                    <rect key="frame" x="0.0" y="123.5" width="414" height="44"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </view>
@@ -68,7 +68,7 @@
                                 </connections>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4TU-gr-dbP" userLabel="View Quota">
-                                <rect key="frame" x="0.0" y="731" width="414" height="66"/>
+                                <rect key="frame" x="0.0" y="780" width="414" height="66"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="elX-0f-dn0">
                                         <rect key="frame" x="35" y="8" width="344" height="20"/>

+ 2 - 2
iOSClient/More/NCMore.swift

@@ -104,14 +104,14 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         // ITEM : Transfer
         item = NCCommunicationExternalSite()
         item.name = "_transfers_"
-        item.icon = "load"
+        item.icon = "arrow.left.arrow.right"
         item.url = "segueTransfers"
         functionMenu.append(item)
 
         // ITEM : Recent
         item = NCCommunicationExternalSite()
         item.name = "_recent_"
-        item.icon = "recent"
+        item.icon = "clock.arrow.circlepath"
         item.url = "segueRecent"
         functionMenu.append(item)
         

+ 1 - 1
iOSClient/Recent/NCRecent.swift

@@ -32,7 +32,7 @@ class NCRecent: NCCollectionViewCommon  {
         titleCurrentFolder = NSLocalizedString("_recent_", comment: "")
         layoutKey = NCGlobal.shared.layoutViewRecent
         enableSearchBar = false
-        emptyImage = UIImage.init(named: "recent")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        emptyImage = UIImage.init(named: "clock.arrow.circlepath")?.image(color: .gray, size: UIScreen.main.bounds.width)
         emptyTitle = "_files_no_files_"
         emptyDescription = ""
     }

+ 1 - 1
iOSClient/Transfers/NCTransfers.swift

@@ -34,7 +34,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate  {
         titleCurrentFolder = NSLocalizedString("_transfers_", comment: "")
         layoutKey = NCGlobal.shared.layoutViewTransfers
         enableSearchBar = false
-        emptyImage = UIImage.init(named: "load")?.image(color: .gray, size: UIScreen.main.bounds.width)
+        emptyImage = UIImage.init(named: "arrow.left.arrow.right")?.image(color: .gray, size: UIScreen.main.bounds.width)
         emptyTitle = "_no_transfer_"
         emptyDescription = "_no_transfer_sub_"
     }