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

Fix build

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-12-27 18:48:57 +03:00
parent 4fe0d47715
commit 273036fc81
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift
View File

@ -16,11 +16,11 @@ private let randomBackgroundColors: [Int32] = [0x007aff, 0x00c2ed, 0x29b327, 0xe
extension TelegramThemeSettings { extension TelegramThemeSettings {
convenience init(baseTheme: TelegramBaseTheme, accentColor: UIColor, messageColors: (top: UIColor, bottom: UIColor?)?, wallpaper: TelegramWallpaper?) { convenience init(baseTheme: TelegramBaseTheme, accentColor: UIColor, messageColors: (top: UIColor, bottom: UIColor?)?, wallpaper: TelegramWallpaper?) {
var messageColorsValues: (Int32, Int32)? var messageColorsValues: (UInt32, UInt32)?
if let colors = messageColors { if let colors = messageColors {
messageColorsValues = (Int32(bitPattern: colors.0.argb), Int32(bitPattern: colors.1?.argb ?? colors.0.argb)) messageColorsValues = (colors.0.argb, colors.1?.argb ?? colors.0.argb)
} }
self.init(baseTheme: baseTheme, accentColor: Int32(bitPattern: accentColor.argb), messageColors: messageColorsValues, wallpaper: wallpaper) self.init(baseTheme: baseTheme, accentColor: accentColor.argb, messageColors: messageColorsValues, wallpaper: wallpaper)
} }
} }
@ -469,7 +469,7 @@ final class ThemeAccentColorController: ViewController {
} else { } else {
let presentationTheme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference)! let presentationTheme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference)!
if case let .cloud(theme) = themeReference, let themeSettings = theme.theme.settings { if case let .cloud(theme) = themeReference, let themeSettings = theme.theme.settings {
accentColor = UIColor(argb: UInt32(bitPattern: themeSettings.accentColor)) accentColor = UIColor(argb: themeSettings.accentColor)
if let customWallpaper = settings.themeSpecificChatWallpapers[themeReference.index] { if let customWallpaper = settings.themeSpecificChatWallpapers[themeReference.index] {
wallpaper = customWallpaper wallpaper = customWallpaper
@ -482,8 +482,8 @@ final class ThemeAccentColorController: ViewController {
} }
if let colors = themeSettings.messageColors { if let colors = themeSettings.messageColors {
let topMessageColor = UIColor(argb: UInt32(bitPattern: colors.top)) let topMessageColor = UIColor(argb: colors.top)
let bottomMessageColor = UIColor(argb: UInt32(bitPattern: colors.bottom)) let bottomMessageColor = UIColor(argb: colors.bottom)
if topMessageColor.argb == bottomMessageColor.argb { if topMessageColor.argb == bottomMessageColor.argb {
messageColors = (topMessageColor, nil) messageColors = (topMessageColor, nil)
} else { } else {

8
submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift
View File

@ -95,7 +95,7 @@ enum ThemeSettingsColorOption: Equatable {
return color.color return color.color
case let .theme(reference): case let .theme(reference):
if case let .cloud(theme) = reference, let settings = theme.theme.settings { if case let .cloud(theme) = reference, let settings = theme.theme.settings {
return UIColor(argb: UInt32(bitPattern: settings.accentColor)) return UIColor(argb: settings.accentColor)
} else { } else {
return nil return nil
} }
@ -117,7 +117,7 @@ enum ThemeSettingsColorOption: Equatable {
return color.plainBubbleColors return color.plainBubbleColors
case let .theme(reference): case let .theme(reference):
if case let .cloud(theme) = reference, let settings = theme.theme.settings, let messageColors = settings.messageColors { if case let .cloud(theme) = reference, let settings = theme.theme.settings, let messageColors = settings.messageColors {
return (UIColor(argb: UInt32(bitPattern: messageColors.top)), UIColor(argb: UInt32(bitPattern: messageColors.bottom))) return (UIColor(argb: messageColors.top), UIColor(argb: messageColors.bottom))
} else { } else {
return nil return nil
} }
@ -130,8 +130,8 @@ enum ThemeSettingsColorOption: Equatable {
return color.customBubbleColors return color.customBubbleColors
case let .theme(reference): case let .theme(reference):
if case let .cloud(theme) = reference, let settings = theme.theme.settings, let messageColors = settings.messageColors { if case let .cloud(theme) = reference, let settings = theme.theme.settings, let messageColors = settings.messageColors {
let topColor = UIColor(argb: UInt32(bitPattern: messageColors.top)) let topColor = UIColor(argb: messageColors.top)
let bottomColor = UIColor(argb: UInt32(bitPattern: messageColors.bottom)) let bottomColor = UIColor(argb: messageColors.bottom)
if topColor.argb != bottomColor.argb { if topColor.argb != bottomColor.argb {
return (topColor, bottomColor) return (topColor, bottomColor)
} else { } else {

2
submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift
View File

@ -49,7 +49,7 @@ public func makePresentationTheme(mediaBox: MediaBox, themeReference: Presentati
} }
case let .cloud(info): case let .cloud(info):
if let settings = info.theme.settings { if let settings = info.theme.settings {
if let loadedTheme = makePresentationTheme(mediaBox: mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), extendingThemeReference: themeReference, accentColor: accentColor ?? UIColor(argb: UInt32(bitPattern: settings.accentColor)), backgroundColors: nil, bubbleColors: bubbleColors ?? settings.messageColors.flatMap { (UIColor(argb: UInt32(bitPattern: $0.top)), UIColor(argb: UInt32(bitPattern: $0.bottom))) }, wallpaper: wallpaper ?? settings.wallpaper, serviceBackgroundColor: serviceBackgroundColor, preview: preview) { if let loadedTheme = makePresentationTheme(mediaBox: mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), extendingThemeReference: themeReference, accentColor: accentColor ?? UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: bubbleColors ?? settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: wallpaper ?? settings.wallpaper, serviceBackgroundColor: serviceBackgroundColor, preview: preview) {
theme = loadedTheme theme = loadedTheme
} else { } else {
return nil return nil

2
submodules/TelegramUI/TelegramUI/OpenChatMessage.swift
View File

@ -569,7 +569,7 @@ func openChatTheme(context: AccountContext, message: Message, pushController: @e
} }
} }
} else if let settings = settings { } else if let settings = settings {
if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: UInt32(bitPattern: settings.accentColor)), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: UInt32(bitPattern: $0.top)), UIColor(argb: UInt32(bitPattern: $0.bottom))) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false) { if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false) {
let controller = ThemePreviewController(context: context, previewTheme: theme, source: .themeSettings(slug, settings)) let controller = ThemePreviewController(context: context, previewTheme: theme, source: .themeSettings(slug, settings))
pushController(controller) pushController(controller)
} else { } else {

2
submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift
View File

@ -355,7 +355,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
navigationController?.pushViewController(previewController) navigationController?.pushViewController(previewController)
} }
} else if let settings = dataAndTheme.1 { } else if let settings = dataAndTheme.1 {
if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: UInt32(bitPattern: settings.accentColor)), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: UInt32(bitPattern: $0.top)), UIColor(argb: UInt32(bitPattern: $0.bottom))) }, wallpaper: settings.wallpaper) { if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper) {
let previewController = ThemePreviewController(context: context, previewTheme: theme, source: .theme(dataAndTheme.2)) let previewController = ThemePreviewController(context: context, previewTheme: theme, source: .theme(dataAndTheme.2))
navigationController?.pushViewController(previewController) navigationController?.pushViewController(previewController)
} }

4
submodules/WallpaperResources/Sources/WallpaperResources.swift
View File

@ -950,7 +950,7 @@ public func themeImage(account: Account, accountManager: AccountManager, source:
} }
} }
case let .settings(settings): case let .settings(settings):
theme = .single((makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: UInt32(bitPattern: settings.accentColor)), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: UInt32(bitPattern: $0.top)), UIColor(argb: UInt32(bitPattern: $0.bottom))) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false), nil)) theme = .single((makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false), nil))
} }
let data = theme let data = theme
@ -1165,7 +1165,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
let themeSignal: Signal<PresentationTheme?, NoError> let themeSignal: Signal<PresentationTheme?, NoError>
if case let .cloud(theme) = theme, let settings = theme.theme.settings { if case let .cloud(theme) = theme, let settings = theme.theme.settings {
themeSignal = Signal { subscriber in themeSignal = Signal { subscriber in
let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: UInt32(bitPattern: settings.accentColor)), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: UInt32(bitPattern: $0.top)), UIColor(argb: UInt32(bitPattern: $0.bottom))) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false) let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false)
subscriber.putNext(theme) subscriber.putNext(theme)
subscriber.putCompletion() subscriber.putCompletion()