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

Theme editor improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2021-09-06 20:21:24 +03:00
parent 4393227307
commit 7998f29f4e
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/SettingsUI/Sources/Themes/EditThemeController.swift
View File

@@ -663,7 +663,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
}) })
} }
case let .edit(info): case let .edit(info):
let _ = (prepare |> then(updateTheme(account: context.account, accountManager: context.sharedContext.accountManager, theme: info.theme, title: state.title, slug: state.slug, resource: state.converting ? nil : themeResource, settings: settings, resetFile: state.converting ? true : false) let _ = (prepare |> then(updateTheme(account: context.account, accountManager: context.sharedContext.accountManager, theme: info.theme, title: state.title, slug: state.slug, resource: state.converting ? nil : themeResource, settings: settings)
|> deliverOnMainQueue)).start(next: { next in |> deliverOnMainQueue)).start(next: { next in
if case let .result(resultTheme) = next { if case let .result(resultTheme) = next {
let _ = applyTheme(accountManager: context.sharedContext.accountManager, account: context.account, theme: resultTheme).start() let _ = applyTheme(accountManager: context.sharedContext.accountManager, account: context.account, theme: resultTheme).start()

8
submodules/TelegramCore/Sources/Themes.swift
View File

@@ -357,7 +357,7 @@ public func createTheme(account: Account, title: String, resource: MediaResource
} }
} }
public func updateTheme(account: Account, accountManager: AccountManager<TelegramAccountManagerTypes>, theme: TelegramTheme, title: String?, slug: String?, resource: MediaResource?, thumbnailData: Data? = nil, settings: TelegramThemeSettings?, resetFile: Bool = false) -> Signal<CreateThemeResult, CreateThemeError> { public func updateTheme(account: Account, accountManager: AccountManager<TelegramAccountManagerTypes>, theme: TelegramTheme, title: String?, slug: String?, resource: MediaResource?, thumbnailData: Data? = nil, settings: TelegramThemeSettings?) -> Signal<CreateThemeResult, CreateThemeError> {
guard title != nil || slug != nil || resource != nil else { guard title != nil || slug != nil || resource != nil else {
return .complete() return .complete()
} }
@@ -370,8 +370,6 @@ public func updateTheme(account: Account, accountManager: AccountManager<Telegra
} }
if let _ = resource { if let _ = resource {
flags |= 1 << 2 flags |= 1 << 2
} else if resetFile {
flags |= 1 << 2
} }
var inputSettings: Api.InputThemeSettings? var inputSettings: Api.InputThemeSettings?
if let settings = settings { if let settings = settings {
@@ -391,9 +389,7 @@ public func updateTheme(account: Account, accountManager: AccountManager<Telegra
} }
|> mapToSignal { result -> Signal<CreateThemeResult, CreateThemeError> in |> mapToSignal { result -> Signal<CreateThemeResult, CreateThemeError> in
let inputDocument: Api.InputDocument? let inputDocument: Api.InputDocument?
if resetFile { if let status = result {
inputDocument = .inputDocumentEmpty
} else if let status = result {
switch status { switch status {
case let .complete(file): case let .complete(file):
if let resource = file.resource as? CloudDocumentMediaResource { if let resource = file.resource as? CloudDocumentMediaResource {