Merge commit '77a592a05c9e599c3dcedb59c1fadc70699bd2e6' into background-task

This commit is contained in:
Peter
2019-10-22 19:10:24 +04:00
97 changed files with 1504 additions and 1090 deletions

View File

@@ -339,6 +339,10 @@ extension PresentationThemeRootNavigationBar: Codable {
case badgeFill
case badgeStroke
case badgeText
case segmentedBg
case segmentedFg
case segmentedText
case segmentedDivider
}
public convenience init(from decoder: Decoder) throws {
@@ -353,7 +357,11 @@ extension PresentationThemeRootNavigationBar: Codable {
separatorColor: try decodeColor(values, .separator),
badgeBackgroundColor: try decodeColor(values, .badgeFill),
badgeStrokeColor: try decodeColor(values, .badgeStroke),
badgeTextColor: try decodeColor(values, .badgeText))
badgeTextColor: try decodeColor(values, .badgeText),
segmentedBackgroundColor: try decodeColor(values, .segmentedBg),
segmentedForegroundColor: try decodeColor(values, .segmentedFg),
segmentedTextColor: try decodeColor(values, .segmentedText),
segmentedDividerColor: try decodeColor(values, .segmentedDivider))
}
public func encode(to encoder: Encoder) throws {
@@ -369,6 +377,10 @@ extension PresentationThemeRootNavigationBar: Codable {
try encodeColor(&values, self.badgeBackgroundColor, .badgeFill)
try encodeColor(&values, self.badgeStrokeColor, .badgeStroke)
try encodeColor(&values, self.badgeTextColor, .badgeText)
try encodeColor(&values, self.segmentedBackgroundColor, .segmentedBg)
try encodeColor(&values, self.segmentedForegroundColor, .segmentedFg)
try encodeColor(&values, self.segmentedTextColor, .segmentedText)
try encodeColor(&values, self.segmentedDividerColor, .segmentedDivider)
}
}