Merge branch 'master' into buck-test

This commit is contained in:
Peter
2019-09-02 20:41:08 +04:00
340 changed files with 4472 additions and 7186 deletions

View File

@@ -146,6 +146,7 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode {
private var theme: PresentationThemeReference?
private var currentTheme: PresentationTheme?
private var accentColor: UIColor?
private var bordered: Bool?
private var selected: Bool?
@@ -176,9 +177,10 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode {
self.currentTheme = currentTheme
}
} else {
if theme != self.theme {
if theme != self.theme || accentColor != self.accentColor {
self.imageNode.setSignal(themeIconImage(account: context.account, accountManager: context.sharedContext.accountManager, theme: theme, accentColor: accentColor))
self.theme = theme
self.accentColor = accentColor
}
}
if self.currentTheme == nil || currentTheme !== self.currentTheme! || bordered != self.bordered || selected != self.selected {