using colors from the VDS colors library.
This commit is contained in:
parent
3a31acfe63
commit
dd8c808fa6
@ -5,7 +5,7 @@
|
|||||||
// Created by Kevin Christiano on 1/30/20.
|
// Created by Kevin Christiano on 1/30/20.
|
||||||
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
// Copyright © 2020 Verizon Wireless. All rights reserved.
|
||||||
//
|
//
|
||||||
|
import VDSColorTokens
|
||||||
|
|
||||||
open class CarouselIndicator: Control, CarouselPageControlProtocol {
|
open class CarouselIndicator: Control, CarouselPageControlProtocol {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -72,7 +72,7 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
|
|||||||
|
|
||||||
public var disabledIndicatorColor: UIColor {
|
public var disabledIndicatorColor: UIColor {
|
||||||
get {
|
get {
|
||||||
guard let model = carouselIndicatorModel else { return .mvmGray44 }
|
guard let model = carouselIndicatorModel else { return VDSColor.paletteGray44 }
|
||||||
return model.inverted ? model.disabledIndicatorColor_inverted.uiColor : model.disabledIndicatorColor.uiColor
|
return model.inverted ? model.disabledIndicatorColor_inverted.uiColor : model.disabledIndicatorColor.uiColor
|
||||||
}
|
}
|
||||||
set {
|
set {
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import VDSColorTokens
|
||||||
|
|
||||||
open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
|
open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -30,8 +30,8 @@ open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelPro
|
|||||||
/// Set true to make the accessibility value as "Slide #currentPage of #totalPage", otherwise will be "Page #currentPage of #totalPage", default is false
|
/// Set true to make the accessibility value as "Slide #currentPage of #totalPage", otherwise will be "Page #currentPage of #totalPage", default is false
|
||||||
public var accessibilityHasSlidesInsteadOfPage: Bool = false
|
public var accessibilityHasSlidesInsteadOfPage: Bool = false
|
||||||
public var enabled: Bool = true
|
public var enabled: Bool = true
|
||||||
public var disabledIndicatorColor: Color = Color(uiColor: .mvmGray44)
|
public var disabledIndicatorColor: Color = Color(uiColor: VDSColor.paletteGray44)
|
||||||
public var disabledIndicatorColor_inverted: Color = Color(uiColor: .mvmGray65)
|
public var disabledIndicatorColor_inverted: Color = Color(uiColor: VDSColor.paletteGray65)
|
||||||
public var indicatorColor: Color = Color(uiColor: .mvmBlack)
|
public var indicatorColor: Color = Color(uiColor: .mvmBlack)
|
||||||
public var indicatorColor_inverted: Color = Color(uiColor: .mvmWhite)
|
public var indicatorColor_inverted: Color = Color(uiColor: .mvmWhite)
|
||||||
public var position: CGFloat?
|
public var position: CGFloat?
|
||||||
|
|||||||
@ -52,8 +52,6 @@ extension UIColor {
|
|||||||
"coolGray3": (.mvmCoolGray3, "#D8DADA"),
|
"coolGray3": (.mvmCoolGray3, "#D8DADA"),
|
||||||
"coolGray6": (.mvmCoolGray6, "#747676"),
|
"coolGray6": (.mvmCoolGray6, "#747676"),
|
||||||
"coolGray10": (.mvmCoolGray10, "#333333"),
|
"coolGray10": (.mvmCoolGray10, "#333333"),
|
||||||
"gray44": (.mvmGray44, "#6F7171"),
|
|
||||||
"gray65": (.mvmGray65, "#A7A7A7"),
|
|
||||||
"upGold1": (.vzupGold1, "#F9D542"),
|
"upGold1": (.vzupGold1, "#F9D542"),
|
||||||
"upGold2": (.vzupGold2, "#F4CA53"),
|
"upGold2": (.vzupGold2, "#F4CA53"),
|
||||||
"upGold3": (.vzupGold3, "#CC9B2D")]
|
"upGold3": (.vzupGold3, "#CC9B2D")]
|
||||||
@ -188,7 +186,7 @@ extension UIColor {
|
|||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|
||||||
/// HEX: #F6F6F6
|
/// HEX: #F6F6F6
|
||||||
@objc public static let mvmCoolGray1 = UIColor.assetColor(named: "coolGray1")
|
public static let mvmCoolGray1 = UIColor.assetColor(named: "coolGray1")
|
||||||
|
|
||||||
/// HEX: #D8DADA
|
/// HEX: #D8DADA
|
||||||
public static let mvmCoolGray3 = UIColor.assetColor(named: "coolGray3")
|
public static let mvmCoolGray3 = UIColor.assetColor(named: "coolGray3")
|
||||||
@ -199,13 +197,6 @@ extension UIColor {
|
|||||||
/// HEX: #333333
|
/// HEX: #333333
|
||||||
public static let mvmCoolGray10 = UIColor.assetColor(named: "coolGray10")
|
public static let mvmCoolGray10 = UIColor.assetColor(named: "coolGray10")
|
||||||
|
|
||||||
/// HEX: #6F7171
|
|
||||||
public static let mvmGray44 = UIColor.assetColor(named: "gray44")
|
|
||||||
|
|
||||||
/// HEX: #A7A7A7
|
|
||||||
public static let mvmGray65 = UIColor.assetColor(named: "gray65")
|
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - VZ UP Brand
|
// MARK: - VZ UP Brand
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"colors" : [
|
|
||||||
{
|
|
||||||
"color" : {
|
|
||||||
"color-space" : "srgb",
|
|
||||||
"components" : {
|
|
||||||
"alpha" : "1.000",
|
|
||||||
"blue" : "0x71",
|
|
||||||
"green" : "0x71",
|
|
||||||
"red" : "0x6F"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
{
|
|
||||||
"colors" : [
|
|
||||||
{
|
|
||||||
"color" : {
|
|
||||||
"color-space" : "srgb",
|
|
||||||
"components" : {
|
|
||||||
"alpha" : "1.000",
|
|
||||||
"blue" : "0xA7",
|
|
||||||
"green" : "0xA7",
|
|
||||||
"red" : "0xA7"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user