ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Theme accent colors improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-08-21 02:17:18 +03:00
parent 263d78c1b3
commit f731e91b1a
16 changed files with 2966 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
View File

@@ -437,8 +437,8 @@ extension PresentationThemeContextMenu: Codable {
case background
case itemSeparator
case sectionSeparator
case itemBackground
case itemHighlightedBackground
case itemBg
case itemHighlightedBg
case primary
case secondary
case destructive
@@ -446,16 +446,15 @@ extension PresentationThemeContextMenu: Codable {
public convenience init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self)
self.init(
dimColor: try decodeColor(values, .dim),
backgroundColor: try decodeColor(values, .background),
itemSeparatorColor: try decodeColor(values, .itemSeparator),
sectionSeparatorColor: try decodeColor(values, .sectionSeparator),
itemBackgroundColor: try decodeColor(values, .itemBackground),
itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBackground),
primaryColor: try decodeColor(values, .primary),
secondaryColor: try decodeColor(values, .secondary),
destructiveColor: try decodeColor(values, .destructive)
self.init(dimColor: try decodeColor(values, .dim),
backgroundColor: try decodeColor(values, .background),
itemSeparatorColor: try decodeColor(values, .itemSeparator),
sectionSeparatorColor: try decodeColor(values, .sectionSeparator),
itemBackgroundColor: try decodeColor(values, .itemBg),
itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg),
primaryColor: try decodeColor(values, .primary),
secondaryColor: try decodeColor(values, .secondary),
destructiveColor: try decodeColor(values, .destructive)
)
}
@@ -465,8 +464,8 @@ extension PresentationThemeContextMenu: Codable {
try encodeColor(&values, self.backgroundColor, .background)
try encodeColor(&values, self.itemSeparatorColor, .itemSeparator)
try encodeColor(&values, self.sectionSeparatorColor, .sectionSeparator)
try encodeColor(&values, self.itemBackgroundColor, .itemBackground)
try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBackground)
try encodeColor(&values, self.itemBackgroundColor, .itemBg)
try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg)
try encodeColor(&values, self.primaryColor, .primary)
try encodeColor(&values, self.secondaryColor, .secondary)
try encodeColor(&values, self.destructiveColor, .destructive)
@@ -1500,6 +1499,7 @@ extension PresentationTheme: Codable {
try container.encode(self.chatList, forKey: .chatList)
try container.encode(self.chat, forKey: .chat)
try container.encode(self.actionSheet, forKey: .actionSheet)
try container.encode(self.contextMenu, forKey: .contextMenu)
try container.encode(self.inAppNotification, forKey: .notification)
}
}