mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/graphview' into 'feature/coding'

Browse Source 
update color

See merge request BPHV_MIPS/mvm_core_ui!223
This commit is contained in:
Pfeil, Scott Robert 2020-01-15 16:36:15 -05:00
commit 1f4155b773
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI/Atoms/Views/GraphView.swift
View File

@ -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 number of colors is even, need to display gradient layer, otherwise make top layer as solid color layer
if graphObject.colors.count % 2 == 0 { if graphObject.colors.count % 2 == 0 {
leftColors.removeLast() 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 { } else {
topLayer.backgroundColor = leftColors.last?.uiColor.cgColor topLayer.backgroundColor = leftColors.last?.uiColor.cgColor
} }
@ -125,7 +127,9 @@ import UIKit
//count of graidentLayer.colors must be bigger than 1, otherwise set backgroundColor //count of graidentLayer.colors must be bigger than 1, otherwise set backgroundColor
if leftColors.count > 1 { if leftColors.count > 1 {
leftLayer.colors = Array(leftColors) leftLayer.colors = leftColors.map({ (color) -> CGColor in
return color.uiColor.cgColor
})
} else { } else {
leftLayer.backgroundColor = leftColors.first?.uiColor.cgColor leftLayer.backgroundColor = leftColors.first?.uiColor.cgColor
} }
@ -136,7 +140,9 @@ import UIKit
rightLayer.startPoint = CGPoint(x: 0, y: 0) rightLayer.startPoint = CGPoint(x: 0, y: 0)
rightLayer.endPoint = CGPoint(x: 0, y: 1) rightLayer.endPoint = CGPoint(x: 0, y: 1)
if rightColors.count > 1 { if rightColors.count > 1 {
rightLayer.colors = Array(rightColors) rightLayer.colors = rightColors.map({ (color) -> CGColor in
return color.uiColor.cgColor
})
} else { } else {
rightLayer.backgroundColor = rightColors.first?.uiColor.cgColor rightLayer.backgroundColor = rightColors.first?.uiColor.cgColor
} }