From 703e0cd32bc06b1866fee7a95c5dbb411b3a699c Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 15 Jan 2020 12:38:31 -0500 Subject: [PATCH 1/3] Convenience to access cgColor. --- MVMCoreUI/Models/Primitive Models/Color.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MVMCoreUI/Models/Primitive Models/Color.swift b/MVMCoreUI/Models/Primitive Models/Color.swift index e4c0e4fa..d72e1af9 100644 --- a/MVMCoreUI/Models/Primitive Models/Color.swift +++ b/MVMCoreUI/Models/Primitive Models/Color.swift @@ -19,6 +19,11 @@ public final class Color: Codable { //-------------------------------------------------- public let uiColor: UIColor + + public var cgColor: CGColor { + return uiColor.cgColor + } + public private(set) var hex: String = "" public private(set) var name: String = "" From 388d88b47c4049cd78f2c532891e6b5ec028deeb Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 15 Jan 2020 13:13:15 -0500 Subject: [PATCH 2/3] autorResiszing exception. --- MVMCoreUI/Molecules/Items/TableViewCell.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/MVMCoreUI/Molecules/Items/TableViewCell.swift b/MVMCoreUI/Molecules/Items/TableViewCell.swift index 537af049..dc62ae65 100644 --- a/MVMCoreUI/Molecules/Items/TableViewCell.swift +++ b/MVMCoreUI/Molecules/Items/TableViewCell.swift @@ -192,6 +192,7 @@ import UIKit @objc public func addCaretViewAccessory() { guard accessoryView == nil else { return } caretView = CaretView(lineWidth: 1) + caretView?.translatesAutoresizingMaskIntoConstraints = true caretView?.size = .small(.vertical) caretView?.setConstraints() From e95afdc2491ba00193122adc00ed02172f4e9d74 Mon Sep 17 00:00:00 2001 From: "Pan, Xinlei (Ryan)" Date: Wed, 15 Jan 2020 16:36:13 -0500 Subject: [PATCH 3/3] update color --- MVMCoreUI/Atoms/Views/GraphView.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/MVMCoreUI/Atoms/Views/GraphView.swift b/MVMCoreUI/Atoms/Views/GraphView.swift index cda77660..1f6ea45b 100644 --- a/MVMCoreUI/Atoms/Views/GraphView.swift +++ b/MVMCoreUI/Atoms/Views/GraphView.swift @@ -112,7 +112,9 @@ import UIKit //if number of colors is even, need to display gradient layer, otherwise make top layer as solid color layer if graphObject.colors.count % 2 == 0 { leftColors.removeLast() - topLayer.colors = [leftColors.last!, rightColors.first!] + let firstColor = leftColors.last!.uiColor.cgColor + let secondColor = rightColors.first!.uiColor.cgColor + topLayer.colors = [firstColor, secondColor] } else { topLayer.backgroundColor = leftColors.last?.uiColor.cgColor } @@ -125,7 +127,9 @@ import UIKit //count of graidentLayer.colors must be bigger than 1, otherwise set backgroundColor if leftColors.count > 1 { - leftLayer.colors = Array(leftColors) + leftLayer.colors = leftColors.map({ (color) -> CGColor in + return color.uiColor.cgColor + }) } else { leftLayer.backgroundColor = leftColors.first?.uiColor.cgColor } @@ -136,7 +140,9 @@ import UIKit rightLayer.startPoint = CGPoint(x: 0, y: 0) rightLayer.endPoint = CGPoint(x: 0, y: 1) if rightColors.count > 1 { - rightLayer.colors = Array(rightColors) + rightLayer.colors = rightColors.map({ (color) -> CGColor in + return color.uiColor.cgColor + }) } else { rightLayer.backgroundColor = rightColors.first?.uiColor.cgColor }