浏览代码

remove ios12

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父节点
当前提交
19272f2a4e
共有 3 个文件被更改,包括 4 次插入5 次删除
  1. 2 2
      iOSClient/More/NCMore.swift
  2. 0 1
      iOSClient/More/NCMoreUserCell.xib
  3. 2 2
      iOSClient/Utility/NCUtility.swift

+ 2 - 2
iOSClient/More/NCMore.swift

@@ -493,7 +493,7 @@ class CCCellMore: UITableViewCell {
 
 
     override var frame: CGRect {
     override var frame: CGRect {
         get {
         get {
-            return super.bounds
+            return super.frame
         }
         }
         set (newFrame) {
         set (newFrame) {
             var frame = newFrame
             var frame = newFrame
@@ -515,7 +515,7 @@ class NCMoreUserCell: UITableViewCell {
     
     
     override var frame: CGRect {
     override var frame: CGRect {
         get {
         get {
-            return super.bounds
+            return super.frame
         }
         }
         set (newFrame) {
         set (newFrame) {
             var frame = newFrame
             var frame = newFrame

+ 0 - 1
iOSClient/More/NCMoreUserCell.xib

@@ -44,7 +44,6 @@
                         <nil key="highlightedColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     </label>
                 </subviews>
                 </subviews>
-                <color key="tintColor" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 <constraints>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="QNC-8X-DAC" secondAttribute="trailing" constant="20" id="28X-bj-Yak"/>
                     <constraint firstAttribute="trailing" secondItem="QNC-8X-DAC" secondAttribute="trailing" constant="20" id="28X-bj-Yak"/>
                     <constraint firstItem="p7I-KN-FVZ" firstAttribute="leading" secondItem="5" secondAttribute="trailing" constant="15" id="DXv-dr-zaw"/>
                     <constraint firstItem="p7I-KN-FVZ" firstAttribute="leading" secondItem="5" secondAttribute="trailing" constant="15" id="DXv-dr-zaw"/>

+ 2 - 2
iOSClient/Utility/NCUtility.swift

@@ -671,9 +671,9 @@ class NCUtility: NSObject {
         // see https://stackoverflow.com/questions/71764255
         // see https://stackoverflow.com/questions/71764255
         let sfSymbolName = imageName.replacingOccurrences(of: "_", with: ".")
         let sfSymbolName = imageName.replacingOccurrences(of: "_", with: ".")
         if let symbolConfiguration = symbolConfiguration {
         if let symbolConfiguration = symbolConfiguration {
-            image = UIImage(systemName: sfSymbolName, withConfiguration: symbolConfiguration as? UIImage.Configuration)?.imageColor(color)
+            image = UIImage(systemName: sfSymbolName, withConfiguration: symbolConfiguration as? UIImage.Configuration)?.withTintColor(color, renderingMode: .alwaysOriginal)
         } else {
         } else {
-            image = UIImage(systemName: sfSymbolName)?.imageColor(color)
+            image = UIImage(systemName: sfSymbolName)?.withTintColor(color, renderingMode: .alwaysOriginal)
         }
         }
         if image == nil {
         if image == nil {
             image = UIImage(named: imageName)?.image(color: color, size: size)
             image = UIImage(named: imageName)?.image(color: color, size: size)