story:ONEAPP-6315: Updated background color, drop shadow according to states based on component surface.

This commit is contained in:
vasavk 2024-01-30 10:48:20 +05:30
parent 8836325e48
commit 1646eb75dc

View File

@ -181,13 +181,19 @@ open class ButtonIcon: Control {
}() }()
} }
private struct LowContrastColorFillFloatingConfiguration: Configuration { private struct LowContrastColorFillFloatingConfiguration: Configuration, Dropshadowable {
var kind: Kind = .lowContrast var kind: Kind = .lowContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = true var floating: Bool = true
var backgroundColorConfiguration: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.paletteWhite, VDSColor.paletteGray20).eraseToAnyColorable()
}() }()
var shadowColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.paletteBlack, VDSColor.paletteBlack).eraseToAnyColorable()
}()
var shadowOpacity: CGFloat = 0.16
var shadowOffset: CGSize = .init(width: 0, height: 2)
var shadowRadius: CGFloat = 4
} }
private struct LowContrastMediaConfiguration: Configuration, Borderable { private struct LowContrastMediaConfiguration: Configuration, Borderable {
@ -195,11 +201,11 @@ open class ButtonIcon: Control {
var surfaceType: SurfaceType = .media var surfaceType: SurfaceType = .media
var floating: Bool = false var floating: Bool = false
var backgroundColorConfiguration: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, VDSColor.backgroundPrimaryDark).eraseToAnyColorable()
}() }()
var borderWidth: CGFloat = 1.0 var borderWidth: CGFloat = 1.0
var borderColorConfiguration: AnyColorable = { var borderColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.elementsLowcontrastOnlight, VDSColor.elementsLowcontrastOndark).eraseToAnyColorable()
}() }()
} }
@ -208,14 +214,14 @@ open class ButtonIcon: Control {
var surfaceType: SurfaceType = .media var surfaceType: SurfaceType = .media
var floating: Bool = true var floating: Bool = true
var backgroundColorConfiguration: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.backgroundPrimaryLight, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.paletteWhite, VDSColor.paletteGray20).eraseToAnyColorable()
}() }()
var shadowColorConfiguration: AnyColorable = { var shadowColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.paletteBlack, .clear).eraseToAnyColorable() SurfaceColorConfiguration(VDSColor.paletteBlack, VDSColor.paletteBlack).eraseToAnyColorable()
}() }()
var shadowOpacity: CGFloat = 0.16 var shadowOpacity: CGFloat = 0.16
var shadowOffset: CGSize = .init(width: 0, height: 2) var shadowOffset: CGSize = .init(width: 0, height: 2)
var shadowRadius: CGFloat = 2 var shadowRadius: CGFloat = 4
} }
private struct HighContrastConfiguration: Configuration { private struct HighContrastConfiguration: Configuration {
@ -232,17 +238,23 @@ open class ButtonIcon: Control {
}() }()
} }
private struct HighContrastFloatingConfiguration: Configuration { private struct HighContrastFloatingConfiguration: Configuration, Dropshadowable {
var kind: Kind = .highContrast var kind: Kind = .highContrast
var surfaceType: SurfaceType = .colorFill var surfaceType: SurfaceType = .colorFill
var floating: Bool = true var floating: Bool = true
var backgroundColorConfiguration: AnyColorable = { var backgroundColorConfiguration: AnyColorable = {
return ControlColorConfiguration().with { return ControlColorConfiguration().with {
$0.setSurfaceColors(VDSColor.backgroundPrimaryLight, VDSColor.backgroundPrimaryLight, forState: .normal) $0.setSurfaceColors(VDSColor.paletteGray20, VDSColor.paletteWhite, forState: .normal)
$0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted) $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
$0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled) $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
}.eraseToAnyColorable() }.eraseToAnyColorable()
}() }()
var shadowColorConfiguration: AnyColorable = {
SurfaceColorConfiguration(VDSColor.paletteBlack, VDSColor.paletteBlack).eraseToAnyColorable()
}()
var shadowOpacity: CGFloat = 0.16
var shadowOffset: CGSize = .init(width: 0, height: 2)
var shadowRadius: CGFloat = 6
} }
//-------------------------------------------------- //--------------------------------------------------