marinofaggiana 4 жил өмнө
parent
commit
2dca7715a2

+ 37 - 1
iOSClient/Brand/NCBrand.swift

@@ -193,12 +193,48 @@ class NCBrandColor: NSObject {
     @objc public var separator: UIColor {
         get {
             if #available(iOS 13, *) {
-                return .opaqueSeparator
+                return .separator
             } else {
                 return UIColor(red: 0.24, green: 0.24, blue: 0.26, alpha: 1.0)
             }
         }
     }
+    @objc public var opaqueSeparator: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .opaqueSeparator
+            } else {
+                return UIColor(red: 0.78, green: 0.78, blue: 0.78, alpha: 1.0)
+            }
+        }
+    }
+    @objc public var systemGray4: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .systemGray4
+            } else {
+                return UIColor(red: 0.82, green: 0.82, blue: 0.84, alpha: 1.0)
+            }
+        }
+    }
+    @objc public var systemGray5: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .systemGray5
+            } else {
+                return UIColor(red: 0.9, green: 0.9, blue: 0.92, alpha: 1.0)
+            }
+        }
+    }
+    @objc public var systemGray6: UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .systemGray6
+            } else {
+                return UIColor(red: 0.95, green: 0.95, blue: 0.97, alpha: 1.0)
+            }
+        }
+    }
     
     @objc public let nextcloud:             UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
     @objc public let nextcloudSoft:         UIColor = UIColor(red: 90.0/255.0, green: 160.0/255.0, blue: 210.0/255.0, alpha: 1.0)

+ 6 - 5
iOSClient/ScanDocument/ScanCollectionView.swift

@@ -59,24 +59,25 @@ class DragDropViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        view.backgroundColor = NCBrandColor.shared.systemGroupedBackground
+        view.backgroundColor = NCBrandColor.shared.secondarySystemGroupedBackground
+        navigationItem.title = NSLocalizedString("_scanned_images_", comment: "")
 
         collectionViewSource.dragInteractionEnabled = true
         collectionViewSource.dragDelegate = self
         collectionViewSource.dropDelegate = self
-        collectionViewSource.backgroundColor = NCBrandColor.shared.systemGroupedBackground
+        collectionViewSource.backgroundColor = NCBrandColor.shared.secondarySystemGroupedBackground
 
         collectionViewDestination.dragInteractionEnabled = true
         collectionViewDestination.dropDelegate = self
         collectionViewDestination.dragDelegate = self
         collectionViewDestination.reorderingCadence = .fast //default value - .immediate
-        collectionViewDestination.backgroundColor = NCBrandColor.shared.systemGroupedBackground
+        collectionViewDestination.backgroundColor = NCBrandColor.shared.secondarySystemGroupedBackground
 
-        self.navigationItem.title = NSLocalizedString("_scanned_images_", comment: "")
         cancel.title = NSLocalizedString("_cancel_", comment: "")
         save.title = NSLocalizedString("_save_", comment: "")
+        
         labelTitlePDFzone.text = NSLocalizedString("_scan_label_document_zone_", comment: "")
-        labelTitlePDFzone.backgroundColor = NCBrandColor.shared.systemBackground
+        labelTitlePDFzone.backgroundColor = NCBrandColor.shared.systemGray6
         labelTitlePDFzone.textColor = NCBrandColor.shared.label
 
         segmentControlFilter.setTitle(NSLocalizedString("_filter_original_", comment: ""), forSegmentAt: 0)